Skip to content

J
json
Unverified Commit e23af743 authored by Niels Lohmann's avatar Niels Lohmann
Browse files
Options

🚨 fix warnings

parent aeecc09b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
include/nlohmann/json.hpp
View file @ e23af743
......@@ -1255,6 +1255,8 @@ class basic_json
{
return j.m_parent == this;
}));
#else
static_cast<void>(check_parents);
#endif
}
......@@ -3611,7 +3613,7 @@ class basic_json
#if JSON_DIAGNOSTICS
// set parent for values added above
set_parents(begin() + previous_size, idx + 1 - previous_size);
set_parents(begin() + static_cast<typename iterator::difference_type>(previous_size), static_cast<typename iterator::difference_type>(idx + 1 - previous_size));
#endif
}
......
single_include/nlohmann/json.hpp
View file @ e23af743
......@@ -18038,6 +18038,8 @@ class basic_json
{
return j.m_parent == this;
}));
#else
static_cast<void>(check_parents);
#endif
}
......@@ -20394,7 +20396,7 @@ class basic_json
#if JSON_DIAGNOSTICS
// set parent for values added above
set_parents(begin() + previous_size, idx + 1 - previous_size);
set_parents(begin() + static_cast<typename iterator::difference_type>(previous_size), static_cast<typename iterator::difference_type>(idx + 1 - previous_size));
#endif
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment