amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-18 12:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GCC and clang-tidy warnings in the JSON pointer speedups

Browse Source 
Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-10-17 08:29:05 +02:00
1 parent 8c2857d974
commit 65fbbc5588
2 files changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/json_pointer.hpp
+4 -3
View File
@@ -27,6 +27,7 @@
#include <nlohmann/detail/exceptions.hpp> #include <nlohmann/detail/exceptions.hpp>
#include <nlohmann/detail/macro_scope.hpp> #include <nlohmann/detail/macro_scope.hpp>
#include <nlohmann/detail/meta/cpp_future.hpp> #include <nlohmann/detail/meta/cpp_future.hpp>
#include <nlohmann/detail/meta/type_traits.hpp>
#include <nlohmann/detail/string_concat.hpp> #include <nlohmann/detail/string_concat.hpp>
#include <nlohmann/detail/string_escape.hpp> #include <nlohmann/detail/string_escape.hpp>
#include <nlohmann/detail/string_utils.hpp> #include <nlohmann/detail/string_utils.hpp>
@@ -599,7 +600,7 @@ class json_pointer
std::memcpy(&w, data + i, size - i); std::memcpy(&w, data + i, size - i);
} }
h = (h ^ w) * 0x9E3779B97F4A7C15ULL; h = (h ^ w) * 0x9E3779B97F4A7C15ULL;
return static_cast<std::size_t>(h ^ (h >> 29u)); return detail::conditional_static_cast<std::size_t>(h ^ (h >> 29u));
} }
void grow() void grow()
@@ -1275,7 +1276,7 @@ class json_pointer
std::size_t pos = buf.size(); std::size_t pos = buf.size();
do do
{ {
buf[--pos] = static_cast<char>('0' + i % 10); buf[--pos] = static_cast<char>('0' + (i % 10));
i /= 10; i /= 10;
} }
while (i != 0); while (i != 0);
@@ -1327,7 +1328,7 @@ class json_pointer
// flatten `v`, whose path is `path`: primitives and empty containers // flatten `v`, whose path is `path`: primitives and empty containers
// are added to the result right away; other containers get a frame // are added to the result right away; other containers get a frame
auto& object = *result.m_data.m_value.object; auto& object = *result.m_data.m_value.object;
typename BasicJsonType::object_t::iterator hint = object.end(); auto hint = object.end();
const auto enter = [&stack, &path, &object, &hint](const BasicJsonType & v) const auto enter = [&stack, &path, &object, &hint](const BasicJsonType & v)
{ {
switch (v.type()) switch (v.type())
single_include/nlohmann/json.hpp
Generated
+5 -3
View File
@@ -20995,6 +20995,8 @@ NLOHMANN_JSON_NAMESPACE_END
// #include <nlohmann/detail/meta/cpp_future.hpp> // #include <nlohmann/detail/meta/cpp_future.hpp>
// #include <nlohmann/detail/meta/type_traits.hpp>
// #include <nlohmann/detail/string_concat.hpp> // #include <nlohmann/detail/string_concat.hpp>
// #include <nlohmann/detail/string_escape.hpp> // #include <nlohmann/detail/string_escape.hpp>
@@ -21571,7 +21573,7 @@ class json_pointer
std::memcpy(&w, data + i, size - i); std::memcpy(&w, data + i, size - i);
} }
h = (h ^ w) * 0x9E3779B97F4A7C15ULL; h = (h ^ w) * 0x9E3779B97F4A7C15ULL;
return static_cast<std::size_t>(h ^ (h >> 29u)); return detail::conditional_static_cast<std::size_t>(h ^ (h >> 29u));
} }
void grow() void grow()
@@ -22247,7 +22249,7 @@ class json_pointer
std::size_t pos = buf.size(); std::size_t pos = buf.size();
do do
{ {
buf[--pos] = static_cast<char>('0' + i % 10); buf[--pos] = static_cast<char>('0' + (i % 10));
i /= 10; i /= 10;
} }
while (i != 0); while (i != 0);
@@ -22299,7 +22301,7 @@ class json_pointer
// flatten `v`, whose path is `path`: primitives and empty containers // flatten `v`, whose path is `path`: primitives and empty containers
// are added to the result right away; other containers get a frame // are added to the result right away; other containers get a frame
auto& object = *result.m_data.m_value.object; auto& object = *result.m_data.m_value.object;
typename BasicJsonType::object_t::iterator hint = object.end(); auto hint = object.end();
const auto enter = [&stack, &path, &object, &hint](const BasicJsonType & v) const auto enter = [&stack, &path, &object, &hint](const BasicJsonType & v)
{ {
switch (v.type()) switch (v.type())