lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Code Activity

🚨 fix warnings

Browse Source
This commit is contained in:
Niels Lohmann
2019-07-02 21:06:42 +02:00
parent 346e9813c5
commit 947656544d
14 changed files with 406 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
single_include/nlohmann/json.hpp
View File

@ -7842,21 +7842,18 @@ class lexer
}
JSON_HEDLEY_NON_NULL(2)
JSON_HEDLEY_CONST
static void strtof(float& f, const char* str, char** endptr) noexcept
{
f = std::strtof(str, endptr);
}
JSON_HEDLEY_NON_NULL(2)
JSON_HEDLEY_CONST
static void strtof(double& f, const char* str, char** endptr) noexcept
{
f = std::strtod(str, endptr);
}
JSON_HEDLEY_NON_NULL(2)
JSON_HEDLEY_CONST
static void strtof(long double& f, const char* str, char** endptr) noexcept
{
f = std::strtold(str, endptr);
@ -12316,7 +12313,7 @@ class binary_writer
case value_t::number_unsigned:
{
if (j.m_value.number_unsigned <= (std::numeric_limits<std::int8_t>::max)())
if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
{
return 'i';
}
@ -12324,11 +12321,11 @@ class binary_writer
{
return 'U';
}
if (j.m_value.number_unsigned <= (std::numeric_limits<std::int16_t>::max)())
if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
{
return 'I';
}
if (j.m_value.number_unsigned <= (std::numeric_limits<std::int32_t>::max)())
if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
{
return 'l';
}