External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🚨 fix warnings

Browse Source
This commit is contained in:
Niels Lohmann 2021-01-28 20:39:50 +01:00
parent b5c5eaad5a
commit de9ae4e759
No known key found for this signature in database
GPG Key ID: 7F3CEA63AE251B69
6 changed files with 30 additions and 20 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

@ -2211,8 +2211,8 @@ class binary_reader
} }
// parse number string // parse number string
using ia_type = decltype(detail::input_adapter(std::forward<decltype(number_vector)>(number_vector))); using ia_type = decltype(detail::input_adapter(number_vector));
auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(std::forward<decltype(number_vector)>(number_vector)), false); auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
const auto result_number = number_lexer.scan(); const auto result_number = number_lexer.scan();
const auto number_string = number_lexer.get_token_string(); const auto number_string = number_lexer.get_token_string();
const auto result_remainder = number_lexer.scan(); const auto result_remainder = number_lexer.scan();

4
include/nlohmann/detail/iterators/iter_impl.hpp
View File

@ -309,7 +309,7 @@ class iter_impl
@brief post-increment (it++) @brief post-increment (it++)
@pre The iterator is initialized; i.e. `m_object != nullptr`. @pre The iterator is initialized; i.e. `m_object != nullptr`.
*/ */
iter_impl const operator++(int) iter_impl const operator++(int) // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
++(*this); ++(*this);
@ -352,7 +352,7 @@ class iter_impl
@brief post-decrement (it--) @brief post-decrement (it--)
@pre The iterator is initialized; i.e. `m_object != nullptr`. @pre The iterator is initialized; i.e. `m_object != nullptr`.
*/ */
iter_impl const operator--(int) iter_impl const operator--(int) // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
--(*this); --(*this);

4
include/nlohmann/detail/iterators/json_reverse_iterator.hpp
View File

@ -48,7 +48,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {} explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
/// post-increment (it++) /// post-increment (it++)
json_reverse_iterator const operator++(int) json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type)
{ {
return static_cast<json_reverse_iterator>(base_iterator::operator++(1)); return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
} }
@ -60,7 +60,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
} }
/// post-decrement (it--) /// post-decrement (it--)
json_reverse_iterator const operator--(int) json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type)
{ {
return static_cast<json_reverse_iterator>(base_iterator::operator--(1)); return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
} }

4
include/nlohmann/detail/iterators/primitive_iterator.hpp
View File

@ -87,7 +87,7 @@ class primitive_iterator_t
return *this; return *this;
} }
primitive_iterator_t const operator++(int) noexcept primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
++m_it; ++m_it;
@ -100,7 +100,7 @@ class primitive_iterator_t
return *this; return *this;
} }
primitive_iterator_t const operator--(int) noexcept primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
--m_it; --m_it;

9
include/nlohmann/detail/output/serializer.hpp
View File

@ -454,12 +454,14 @@ class serializer
{ {
if (codepoint <= 0xFFFF) if (codepoint <= 0xFFFF)
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x", (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
static_cast<std::uint16_t>(codepoint)); static_cast<std::uint16_t>(codepoint));
bytes += 6; bytes += 6;
} }
else else
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x", (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)), static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))); static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
@ -498,6 +500,7 @@ class serializer
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(3, '\0'); std::string sn(3, '\0');
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(&sn[0], sn.size(), "%.2X", byte); (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
} }
@ -592,6 +595,7 @@ class serializer
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(3, '\0'); std::string sn(3, '\0');
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back())); (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
} }
@ -783,8 +787,8 @@ class serializer
void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/) void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
{ {
char* begin = number_buffer.data(); auto* begin = number_buffer.data();
char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x); auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
o->write_characters(begin, static_cast<size_t>(end - begin)); o->write_characters(begin, static_cast<size_t>(end - begin));
} }
@ -795,6 +799,7 @@ class serializer
static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10; static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
// the actual conversion // the actual conversion
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x); std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
// negative value indicates an error // negative value indicates an error

25
single_include/nlohmann/json.hpp
View File

@ -9959,8 +9959,8 @@ class binary_reader
} }
// parse number string // parse number string
using ia_type = decltype(detail::input_adapter(std::forward<decltype(number_vector)>(number_vector))); using ia_type = decltype(detail::input_adapter(number_vector));
auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(std::forward<decltype(number_vector)>(number_vector)), false); auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
const auto result_number = number_lexer.scan(); const auto result_number = number_lexer.scan();
const auto number_string = number_lexer.get_token_string(); const auto number_string = number_lexer.get_token_string();
const auto result_remainder = number_lexer.scan(); const auto result_remainder = number_lexer.scan();
@ -10817,7 +10817,7 @@ class primitive_iterator_t
return *this; return *this;
} }
primitive_iterator_t const operator++(int) noexcept primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
++m_it; ++m_it;
@ -10830,7 +10830,7 @@ class primitive_iterator_t
return *this; return *this;
} }
primitive_iterator_t const operator--(int) noexcept primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
--m_it; --m_it;
@ -11194,7 +11194,7 @@ class iter_impl
@brief post-increment (it++) @brief post-increment (it++)
@pre The iterator is initialized; i.e. `m_object != nullptr`. @pre The iterator is initialized; i.e. `m_object != nullptr`.
*/ */
iter_impl const operator++(int) iter_impl const operator++(int) // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
++(*this); ++(*this);
@ -11237,7 +11237,7 @@ class iter_impl
@brief post-decrement (it--) @brief post-decrement (it--)
@pre The iterator is initialized; i.e. `m_object != nullptr`. @pre The iterator is initialized; i.e. `m_object != nullptr`.
*/ */
iter_impl const operator--(int) iter_impl const operator--(int) // NOLINT(readability-const-return-type)
{ {
auto result = *this; auto result = *this;
--(*this); --(*this);
@ -11578,7 +11578,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {} explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
/// post-increment (it++) /// post-increment (it++)
json_reverse_iterator const operator++(int) json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type)
{ {
return static_cast<json_reverse_iterator>(base_iterator::operator++(1)); return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
} }
@ -11590,7 +11590,7 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
} }
/// post-decrement (it--) /// post-decrement (it--)
json_reverse_iterator const operator--(int) json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type)
{ {
return static_cast<json_reverse_iterator>(base_iterator::operator--(1)); return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
} }
@ -16004,12 +16004,14 @@ class serializer
{ {
if (codepoint <= 0xFFFF) if (codepoint <= 0xFFFF)
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x", (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
static_cast<std::uint16_t>(codepoint)); static_cast<std::uint16_t>(codepoint));
bytes += 6; bytes += 6;
} }
else else
{ {
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x", (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)), static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))); static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
@ -16048,6 +16050,7 @@ class serializer
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(3, '\0'); std::string sn(3, '\0');
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(&sn[0], sn.size(), "%.2X", byte); (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn)); JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
} }
@ -16142,6 +16145,7 @@ class serializer
case error_handler_t::strict: case error_handler_t::strict:
{ {
std::string sn(3, '\0'); std::string sn(3, '\0');
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
(std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back())); (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn)); JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
} }
@ -16333,8 +16337,8 @@ class serializer
void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/) void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
{ {
char* begin = number_buffer.data(); auto* begin = number_buffer.data();
char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x); auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
o->write_characters(begin, static_cast<size_t>(end - begin)); o->write_characters(begin, static_cast<size_t>(end - begin));
} }
@ -16345,6 +16349,7 @@ class serializer
static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10; static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
// the actual conversion // the actual conversion
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x); std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
// negative value indicates an error // negative value indicates an error