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

🚑 fixed compilation error

Browse source
This commit is contained in:
Niels Lohmann 2018-10-07 21:34:40 +02:00
parent 3abb788139
commit 6e49d9f5ff
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,9 +104,9 @@ class lexer
// delete because of pointer members // delete because of pointer members
lexer(const lexer&) = delete; lexer(const lexer&) = delete;
lexer(lexer&&) noexcept = default; lexer(lexer&&) = delete;
lexer& operator=(lexer&) = delete; lexer& operator=(lexer&) = delete;
lexer& operator=(lexer&&) noexcept = default; lexer& operator=(lexer&&) = delete;
~lexer() = default; ~lexer() = default;
private: private:

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

@ -53,8 +53,8 @@ class serializer
// delete because of pointer members // delete because of pointer members
serializer(const serializer&) = delete; serializer(const serializer&) = delete;
serializer& operator=(const serializer&) = delete; serializer& operator=(const serializer&) = delete;
serializer(serializer&&) noexcept = default; serializer(serializer&&) = delete;
serializer& operator=(serializer&&) noexcept = default; serializer& operator=(serializer&&) = delete;
~serializer() = default; ~serializer() = default;
/*! /*!

32
single_include/nlohmann/json.hpp
View file

@ -2373,9 +2373,9 @@ class lexer
// delete because of pointer members // delete because of pointer members
lexer(const lexer&) = delete; lexer(const lexer&) = delete;
lexer(lexer&&) noexcept = default; lexer(lexer&&) = delete;
lexer& operator=(lexer&) = delete; lexer& operator=(lexer&) = delete;
lexer& operator=(lexer&&) noexcept = default; lexer& operator=(lexer&&) = delete;
~lexer() = default; ~lexer() = default;
private: private:
@ -8510,22 +8510,20 @@ class binary_writer
{ {
return 'i'; return 'i';
} }
else if ((std::numeric_limits<uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)()) if ((std::numeric_limits<uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
{ {
return 'U'; return 'U';
} }
else if ((std::numeric_limits<int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)()) if ((std::numeric_limits<int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
{ {
return 'I'; return 'I';
} }
else if ((std::numeric_limits<int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)()) if ((std::numeric_limits<int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
{ {
return 'l'; return 'l';
} }
else // no check and assume int64_t (see note above) // no check and assume int64_t (see note above)
{ return 'L';
return 'L';
}
} }
case value_t::number_unsigned: case value_t::number_unsigned:
@ -8534,22 +8532,20 @@ class binary_writer
{ {
return 'i'; return 'i';
} }
else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)()) if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
{ {
return 'U'; return 'U';
} }
else if (j.m_value.number_unsigned <= (std::numeric_limits<int16_t>::max)()) if (j.m_value.number_unsigned <= (std::numeric_limits<int16_t>::max)())
{ {
return 'I'; return 'I';
} }
else if (j.m_value.number_unsigned <= (std::numeric_limits<int32_t>::max)()) if (j.m_value.number_unsigned <= (std::numeric_limits<int32_t>::max)())
{ {
return 'l'; return 'l';
} }
else // no check and assume int64_t (see note above) // no check and assume int64_t (see note above)
{ return 'L';
return 'L';
}
} }
case value_t::number_float: case value_t::number_float:
@ -9765,8 +9761,8 @@ class serializer
// delete because of pointer members // delete because of pointer members
serializer(const serializer&) = delete; serializer(const serializer&) = delete;
serializer& operator=(const serializer&) = delete; serializer& operator=(const serializer&) = delete;
serializer(serializer&&) noexcept = default; serializer(serializer&&) = delete;
serializer& operator=(serializer&&) noexcept = default; serializer& operator=(serializer&&) = delete;
~serializer() = default; ~serializer() = default;
/*! /*!