j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

💚 fix CI and #1521

Browse source
This commit is contained in:
Niels Lohmann 2019-03-17 15:20:22 +01:00
parent df0f7f2b5d
commit 56f6d1d68e
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/detail/input/binary_reader.hpp
View file

@ -54,9 +54,9 @@ class binary_reader
// make class move-only // make class move-only
binary_reader(const binary_reader&) = delete; binary_reader(const binary_reader&) = delete;
binary_reader(binary_reader&&) noexcept = default; binary_reader(binary_reader&&) = default;
binary_reader& operator=(const binary_reader&) = delete; binary_reader& operator=(const binary_reader&) = delete;
binary_reader& operator=(binary_reader&&) noexcept = default; binary_reader& operator=(binary_reader&&) = default;
~binary_reader() = default; ~binary_reader() = default;
/*! /*!

4
include/nlohmann/detail/input/json_sax.hpp
View file

@ -161,9 +161,9 @@ class json_sax_dom_parser
// make class move-only // make class move-only
json_sax_dom_parser(const json_sax_dom_parser&) = delete; json_sax_dom_parser(const json_sax_dom_parser&) = delete;
json_sax_dom_parser(json_sax_dom_parser&&) noexcept = default; json_sax_dom_parser(json_sax_dom_parser&&) = default;
json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
json_sax_dom_parser& operator=(json_sax_dom_parser&&) noexcept = default; json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
~json_sax_dom_parser() = default; ~json_sax_dom_parser() = default;
bool null() bool null()

2
include/nlohmann/detail/json_ref.hpp
View file

@ -35,7 +35,7 @@ class json_ref
is_rvalue(true) {} is_rvalue(true) {}
// class should be movable only // class should be movable only
json_ref(json_ref&&) noexcept = default; json_ref(json_ref&&) = default;
json_ref(const json_ref&) = delete; json_ref(const json_ref&) = delete;
json_ref& operator=(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete;
json_ref& operator=(json_ref&&) = delete; json_ref& operator=(json_ref&&) = delete;

2
include/nlohmann/detail/output/serializer.hpp
View file

@ -626,7 +626,7 @@ class serializer
} }
// use a pointer to fill the buffer // use a pointer to fill the buffer
auto buffer_ptr = begin(number_buffer); auto buffer_ptr = number_buffer.begin();
const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755 const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
number_unsigned_t abs_value; number_unsigned_t abs_value;

12
single_include/nlohmann/json.hpp
View file

@ -2839,9 +2839,9 @@ class json_sax_dom_parser
// make class move-only // make class move-only
json_sax_dom_parser(const json_sax_dom_parser&) = delete; json_sax_dom_parser(const json_sax_dom_parser&) = delete;
json_sax_dom_parser(json_sax_dom_parser&&) noexcept = default; json_sax_dom_parser(json_sax_dom_parser&&) = default;
json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete; json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
json_sax_dom_parser& operator=(json_sax_dom_parser&&) noexcept = default; json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
~json_sax_dom_parser() = default; ~json_sax_dom_parser() = default;
bool null() bool null()
@ -3579,9 +3579,9 @@ class binary_reader
// make class move-only // make class move-only
binary_reader(const binary_reader&) = delete; binary_reader(const binary_reader&) = delete;
binary_reader(binary_reader&&) noexcept = default; binary_reader(binary_reader&&) = default;
binary_reader& operator=(const binary_reader&) = delete; binary_reader& operator=(const binary_reader&) = delete;
binary_reader& operator=(binary_reader&&) noexcept = default; binary_reader& operator=(binary_reader&&) = default;
~binary_reader() = default; ~binary_reader() = default;
/*! /*!
@ -9258,7 +9258,7 @@ class json_ref
is_rvalue(true) {} is_rvalue(true) {}
// class should be movable only // class should be movable only
json_ref(json_ref&&) noexcept = default; json_ref(json_ref&&) = default;
json_ref(const json_ref&) = delete; json_ref(const json_ref&) = delete;
json_ref& operator=(const json_ref&) = delete; json_ref& operator=(const json_ref&) = delete;
json_ref& operator=(json_ref&&) = delete; json_ref& operator=(json_ref&&) = delete;
@ -12490,7 +12490,7 @@ class serializer
} }
// use a pointer to fill the buffer // use a pointer to fill the buffer
auto buffer_ptr = begin(number_buffer); auto buffer_ptr = number_buffer.begin();
const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755 const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
number_unsigned_t abs_value; number_unsigned_t abs_value;