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

Merge pull request #2051 from nlohmann/clang10warnings

Browse source 
Fix Clang compiler warnings
This commit is contained in:
Niels Lohmann 2020-04-20 08:04:23 +02:00 committed by GitHub
commit 721a1a0b5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/nlohmann/detail/conversions/to_chars.hpp
View file

@ -1006,7 +1006,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
buf[n] = '.';
return buf + (static_cast<size_t>(k) + 1);
return buf + (static_cast<size_t>(k) + 1U);
}
if (min_exp < n and n <= 0)
@ -1018,7 +1018,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
buf[0] = '0';
buf[1] = '.';
std::memset(buf + 2, '0', static_cast<size_t>(-n));
return buf + (2 + static_cast<size_t>(-n) + k);
return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
}
if (k == 1)

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

@ -259,8 +259,7 @@ class serializer
{
dump_integer(*i);
o->write_character(',');
int index = i - val.m_value.binary->cbegin();
if (index % 16 == 0)
if (std::distance(val.m_value.binary->cbegin(), i) % 16 == 0)
{
o->write_character('\n');
}

7
single_include/nlohmann/json.hpp
View file

@ -14543,7 +14543,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
buf[n] = '.';
return buf + (static_cast<size_t>(k) + 1);
return buf + (static_cast<size_t>(k) + 1U);
}
if (min_exp < n and n <= 0)
@ -14555,7 +14555,7 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
buf[0] = '0';
buf[1] = '.';
std::memset(buf + 2, '0', static_cast<size_t>(-n));
return buf + (2 + static_cast<size_t>(-n) + k);
return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
}
if (k == 1)
@ -14892,8 +14892,7 @@ class serializer
{
dump_integer(*i);
o->write_character(',');
int index = i - val.m_value.binary->cbegin();
if (index % 16 == 0)
if (std::distance(val.m_value.binary->cbegin(), i) % 16 == 0)
{
o->write_character('\n');
}

2
test/src/unit-deserialization.cpp
View file

@ -76,7 +76,7 @@ struct SaxEventLogger : public nlohmann::json_sax<json>
return true;
}
bool binary(std::vector<std::uint8_t>& val)
bool binary(std::vector<std::uint8_t>& val) override
{
std::string binary_contents = "binary(";
std::string comma_space = "";