:rotating_light: fix warnings
diff --git a/include/nlohmann/detail/hash.hpp b/include/nlohmann/detail/hash.hpp index d2d5d33..c32d553 100644 --- a/include/nlohmann/detail/hash.hpp +++ b/include/nlohmann/detail/hash.hpp
@@ -3,6 +3,8 @@ #include <cstddef> // size_t, uint8_t #include <functional> // hash +#include <nlohmann/detail/macro_scope.hpp> + namespace nlohmann { namespace detail
diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 6590470..806e360 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp
@@ -11,6 +11,7 @@ #include <limits> // numeric_limits #include <string> // char_traits, string #include <utility> // make_pair, move +#include <vector> // vector #include <nlohmann/detail/exceptions.hpp> #include <nlohmann/detail/input/input_adapters.hpp>
diff --git a/include/nlohmann/detail/iterators/primitive_iterator.hpp b/include/nlohmann/detail/iterators/primitive_iterator.hpp index 16dcc9f..ae7471e 100644 --- a/include/nlohmann/detail/iterators/primitive_iterator.hpp +++ b/include/nlohmann/detail/iterators/primitive_iterator.hpp
@@ -3,6 +3,8 @@ #include <cstddef> // ptrdiff_t #include <limits> // numeric_limits +#include <nlohmann/detail/macro_scope.hpp> + namespace nlohmann { namespace detail
diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 56c15a3..1706cbd 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp
@@ -3,6 +3,7 @@ #include <limits> // numeric_limits #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type #include <utility> // declval +#include <tuple> // tuple #include <nlohmann/detail/iterators/iterator_traits.hpp> #include <nlohmann/detail/macro_scope.hpp>
diff --git a/include/nlohmann/thirdparty/hedley/hedley_undef.hpp b/include/nlohmann/thirdparty/hedley/hedley_undef.hpp index 88ee044..2f70f13 100644 --- a/include/nlohmann/thirdparty/hedley/hedley_undef.hpp +++ b/include/nlohmann/thirdparty/hedley/hedley_undef.hpp
@@ -1,3 +1,5 @@ +#pragma once + #undef JSON_HEDLEY_ALWAYS_INLINE #undef JSON_HEDLEY_ARM_VERSION #undef JSON_HEDLEY_ARM_VERSION_CHECK
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 676905a..51fe838 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp
@@ -2818,6 +2818,7 @@ #include <limits> // numeric_limits #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type #include <utility> // declval +#include <tuple> // tuple // #include <nlohmann/detail/iterators/iterator_traits.hpp> @@ -4671,6 +4672,9 @@ #include <cstddef> // size_t, uint8_t #include <functional> // hash +// #include <nlohmann/detail/macro_scope.hpp> + + namespace nlohmann { namespace detail @@ -4799,6 +4803,7 @@ #include <limits> // numeric_limits #include <string> // char_traits, string #include <utility> // make_pair, move +#include <vector> // vector // #include <nlohmann/detail/exceptions.hpp> @@ -10707,6 +10712,9 @@ #include <cstddef> // ptrdiff_t #include <limits> // numeric_limits +// #include <nlohmann/detail/macro_scope.hpp> + + namespace nlohmann { namespace detail @@ -25410,6 +25418,8 @@ #undef JSON_EXPLICIT // #include <nlohmann/thirdparty/hedley/hedley_undef.hpp> + + #undef JSON_HEDLEY_ALWAYS_INLINE #undef JSON_HEDLEY_ARM_VERSION #undef JSON_HEDLEY_ARM_VERSION_CHECK