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

🚨 fix warnings

Browse source
This commit is contained in:
Niels Lohmann 2019-07-02 21:06:42 +02:00
parent 346e9813c5
commit 947656544d
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
14 changed files with 406 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -819,21 +819,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);

6
include/nlohmann/detail/output/binary_writer.hpp
View file

@ -1205,7 +1205,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';
}
@ -1213,11 +1213,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';
}