Skip to content

Commit

Permalink
🚨 fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nlohmann committed Dec 26, 2020
1 parent f15d447 commit dfedefb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/nlohmann/detail/hash.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <cstddef> // size_t, uint8_t
#include <functional> // hash

#include <nlohmann/detail/macro_scope.hpp>

namespace nlohmann
{
namespace detail
Expand Down
1 change: 1 addition & 0 deletions include/nlohmann/detail/input/binary_reader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions include/nlohmann/detail/iterators/primitive_iterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits

#include <nlohmann/detail/macro_scope.hpp>

namespace nlohmann
{
namespace detail
Expand Down
1 change: 1 addition & 0 deletions include/nlohmann/detail/meta/type_traits.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions include/nlohmann/thirdparty/hedley/hedley_undef.hpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#pragma once

#undef JSON_HEDLEY_ALWAYS_INLINE
#undef JSON_HEDLEY_ARM_VERSION
#undef JSON_HEDLEY_ARM_VERSION_CHECK
Expand Down
10 changes: 10 additions & 0 deletions single_include/nlohmann/json.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2818,6 +2818,7 @@ constexpr T static_const<T>::value;
#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>

Expand Down Expand Up @@ -4671,6 +4672,9 @@ class byte_container_with_subtype : public BinaryType
#include <cstddef> // size_t, uint8_t
#include <functional> // hash

// #include <nlohmann/detail/macro_scope.hpp>


namespace nlohmann
{
namespace detail
Expand Down Expand Up @@ -4799,6 +4803,7 @@ std::size_t hash(const BasicJsonType& j)
#include <limits> // numeric_limits
#include <string> // char_traits, string
#include <utility> // make_pair, move
#include <vector> // vector

// #include <nlohmann/detail/exceptions.hpp>

Expand Down Expand Up @@ -10707,6 +10712,9 @@ class parser
#include <cstddef> // ptrdiff_t
#include <limits> // numeric_limits

// #include <nlohmann/detail/macro_scope.hpp>


namespace nlohmann
{
namespace detail
Expand Down Expand Up @@ -25410,6 +25418,8 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#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
Expand Down

0 comments on commit dfedefb

Please sign in to comment.