From 2afbaacd8e9f9c276d3b983ede052513fac6bfae Mon Sep 17 00:00:00 2001 From: Timur Aitov Date: Tue, 5 Nov 2019 15:07:29 +0300 Subject: [PATCH] Use relative path --- include/nlohmann/adl_serializer.hpp | 4 +- .../nlohmann/detail/conversions/from_json.hpp | 10 ++-- .../nlohmann/detail/conversions/to_chars.hpp | 3 +- .../nlohmann/detail/conversions/to_json.hpp | 8 ++-- include/nlohmann/detail/exceptions.hpp | 4 +- .../nlohmann/detail/input/binary_reader.hpp | 12 ++--- .../nlohmann/detail/input/input_adapters.hpp | 4 +- include/nlohmann/detail/input/json_sax.hpp | 4 +- include/nlohmann/detail/input/lexer.hpp | 6 +-- include/nlohmann/detail/input/parser.hpp | 14 +++--- .../detail/iterators/internal_iterator.hpp | 2 +- .../nlohmann/detail/iterators/iter_impl.hpp | 14 +++--- .../detail/iterators/iteration_proxy.hpp | 4 +- .../detail/iterators/iterator_traits.hpp | 4 +- include/nlohmann/detail/json_pointer.hpp | 6 +-- include/nlohmann/detail/json_ref.hpp | 2 +- include/nlohmann/detail/macro_scope.hpp | 2 +- include/nlohmann/detail/macro_unscope.hpp | 2 +- include/nlohmann/detail/meta/detected.hpp | 2 +- include/nlohmann/detail/meta/is_sax.hpp | 4 +- include/nlohmann/detail/meta/type_traits.hpp | 10 ++-- .../nlohmann/detail/output/binary_writer.hpp | 6 +-- .../detail/output/output_adapters.hpp | 3 +- include/nlohmann/detail/output/serializer.hpp | 14 +++--- include/nlohmann/json.hpp | 48 +++++++++---------- 25 files changed, 97 insertions(+), 95 deletions(-) diff --git a/include/nlohmann/adl_serializer.hpp b/include/nlohmann/adl_serializer.hpp index eeaa14257..c8a2e9805 100644 --- a/include/nlohmann/adl_serializer.hpp +++ b/include/nlohmann/adl_serializer.hpp @@ -2,8 +2,8 @@ #include -#include -#include +#include "detail/conversions/from_json.hpp" +#include "detail/conversions/to_json.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp index 224fb33f9..7e0083a20 100644 --- a/include/nlohmann/detail/conversions/from_json.hpp +++ b/include/nlohmann/detail/conversions/from_json.hpp @@ -13,11 +13,11 @@ #include // pair, declval #include // valarray -#include -#include -#include -#include -#include +#include "../exceptions.hpp" +#include "../macro_scope.hpp" +#include "../meta/cpp_future.hpp" +#include "../meta/type_traits.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/conversions/to_chars.hpp b/include/nlohmann/detail/conversions/to_chars.hpp index feafaec84..18e47fffa 100644 --- a/include/nlohmann/detail/conversions/to_chars.hpp +++ b/include/nlohmann/detail/conversions/to_chars.hpp @@ -8,7 +8,8 @@ #include // memcpy, memmove #include // numeric_limits #include // conditional -#include + +#include "../macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/conversions/to_json.hpp b/include/nlohmann/detail/conversions/to_json.hpp index db9eaf2bd..99f5754db 100644 --- a/include/nlohmann/detail/conversions/to_json.hpp +++ b/include/nlohmann/detail/conversions/to_json.hpp @@ -10,10 +10,10 @@ #include // valarray #include // vector -#include -#include -#include -#include +#include "../iterators/iteration_proxy.hpp" +#include "../meta/cpp_future.hpp" +#include "../meta/type_traits.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/exceptions.hpp b/include/nlohmann/detail/exceptions.hpp index ed836188c..1571dc59c 100644 --- a/include/nlohmann/detail/exceptions.hpp +++ b/include/nlohmann/detail/exceptions.hpp @@ -4,8 +4,8 @@ #include // runtime_error #include // to_string -#include -#include +#include "input/position_t.hpp" +#include "macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/input/binary_reader.hpp b/include/nlohmann/detail/input/binary_reader.hpp index 22dc55d84..ce4c59281 100644 --- a/include/nlohmann/detail/input/binary_reader.hpp +++ b/include/nlohmann/detail/input/binary_reader.hpp @@ -13,12 +13,12 @@ #include // char_traits, string #include // make_pair, move -#include -#include -#include -#include -#include -#include +#include "../exceptions.hpp" +#include "input_adapters.hpp" +#include "json_sax.hpp" +#include "../macro_scope.hpp" +#include "../meta/is_sax.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/input/input_adapters.hpp b/include/nlohmann/detail/input/input_adapters.hpp index b7b11de03..e9ceaf363 100644 --- a/include/nlohmann/detail/input/input_adapters.hpp +++ b/include/nlohmann/detail/input/input_adapters.hpp @@ -13,8 +13,8 @@ #include // enable_if, is_base_of, is_pointer, is_integral, remove_pointer #include // pair, declval -#include -#include +#include "../iterators/iterator_traits.hpp" +#include "../macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/input/json_sax.hpp b/include/nlohmann/detail/input/json_sax.hpp index 606b7862e..1ab09c3d7 100644 --- a/include/nlohmann/detail/input/json_sax.hpp +++ b/include/nlohmann/detail/input/json_sax.hpp @@ -6,8 +6,8 @@ #include // move #include // vector -#include -#include +#include "../exceptions.hpp" +#include "../macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/input/lexer.hpp b/include/nlohmann/detail/input/lexer.hpp index 0843d749d..ef845b849 100644 --- a/include/nlohmann/detail/input/lexer.hpp +++ b/include/nlohmann/detail/input/lexer.hpp @@ -10,9 +10,9 @@ #include // move #include // vector -#include -#include -#include +#include "input_adapters.hpp" +#include "position_t.hpp" +#include "../macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/input/parser.hpp b/include/nlohmann/detail/input/parser.hpp index 8d4febcbf..c1e7e49f4 100644 --- a/include/nlohmann/detail/input/parser.hpp +++ b/include/nlohmann/detail/input/parser.hpp @@ -8,13 +8,13 @@ #include // move #include // vector -#include -#include -#include -#include -#include -#include -#include +#include "../exceptions.hpp" +#include "input_adapters.hpp" +#include "json_sax.hpp" +#include "lexer.hpp" +#include "../macro_scope.hpp" +#include "../meta/is_sax.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/iterators/internal_iterator.hpp b/include/nlohmann/detail/iterators/internal_iterator.hpp index 2c81f723f..403aae653 100644 --- a/include/nlohmann/detail/iterators/internal_iterator.hpp +++ b/include/nlohmann/detail/iterators/internal_iterator.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "primitive_iterator.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/iterators/iter_impl.hpp b/include/nlohmann/detail/iterators/iter_impl.hpp index 336aba1a4..de082d97a 100644 --- a/include/nlohmann/detail/iterators/iter_impl.hpp +++ b/include/nlohmann/detail/iterators/iter_impl.hpp @@ -4,13 +4,13 @@ #include // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next #include // conditional, is_const, remove_const -#include -#include -#include -#include -#include -#include -#include +#include "../exceptions.hpp" +#include "internal_iterator.hpp" +#include "primitive_iterator.hpp" +#include "../macro_scope.hpp" +#include "../meta/cpp_future.hpp" +#include "../meta/type_traits.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/iterators/iteration_proxy.hpp b/include/nlohmann/detail/iterators/iteration_proxy.hpp index da2e32b42..5a3e688db 100644 --- a/include/nlohmann/detail/iterators/iteration_proxy.hpp +++ b/include/nlohmann/detail/iterators/iteration_proxy.hpp @@ -5,8 +5,8 @@ #include // string, to_string #include // tuple_size, get, tuple_element -#include -#include +#include "../meta/type_traits.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/iterators/iterator_traits.hpp b/include/nlohmann/detail/iterators/iterator_traits.hpp index 4cced80ca..1fddb0ecc 100644 --- a/include/nlohmann/detail/iterators/iterator_traits.hpp +++ b/include/nlohmann/detail/iterators/iterator_traits.hpp @@ -2,8 +2,8 @@ #include // random_access_iterator_tag -#include -#include +#include "../meta/void_t.hpp" +#include "../meta/cpp_future.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/json_pointer.hpp b/include/nlohmann/detail/json_pointer.hpp index 9076441c8..61b10e6e9 100644 --- a/include/nlohmann/detail/json_pointer.hpp +++ b/include/nlohmann/detail/json_pointer.hpp @@ -8,9 +8,9 @@ #include // move #include // vector -#include -#include -#include +#include "exceptions.hpp" +#include "macro_scope.hpp" +#include "value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/json_ref.hpp b/include/nlohmann/detail/json_ref.hpp index c8dec7330..a20df5e53 100644 --- a/include/nlohmann/detail/json_ref.hpp +++ b/include/nlohmann/detail/json_ref.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include "meta/type_traits.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp index 2be7581d1..f78e77a36 100644 --- a/include/nlohmann/detail/macro_scope.hpp +++ b/include/nlohmann/detail/macro_scope.hpp @@ -1,7 +1,7 @@ #pragma once #include // pair -#include +#include "../thirdparty/hedley/hedley.hpp" // This file contains all internal macro definitions // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them diff --git a/include/nlohmann/detail/macro_unscope.hpp b/include/nlohmann/detail/macro_unscope.hpp index 80b293e7d..08ead4312 100644 --- a/include/nlohmann/detail/macro_unscope.hpp +++ b/include/nlohmann/detail/macro_unscope.hpp @@ -18,4 +18,4 @@ #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION #undef NLOHMANN_BASIC_JSON_TPL -#include +#include "../thirdparty/hedley/hedley_undef.hpp" diff --git a/include/nlohmann/detail/meta/detected.hpp b/include/nlohmann/detail/meta/detected.hpp index 5b52460ac..609060d04 100644 --- a/include/nlohmann/detail/meta/detected.hpp +++ b/include/nlohmann/detail/meta/detected.hpp @@ -2,7 +2,7 @@ #include -#include +#include "void_t.hpp" // http://en.cppreference.com/w/cpp/experimental/is_detected namespace nlohmann diff --git a/include/nlohmann/detail/meta/is_sax.hpp b/include/nlohmann/detail/meta/is_sax.hpp index 88295becb..eacb81e0a 100644 --- a/include/nlohmann/detail/meta/is_sax.hpp +++ b/include/nlohmann/detail/meta/is_sax.hpp @@ -4,8 +4,8 @@ #include // declval #include // string -#include -#include +#include "detected.hpp" +#include "type_traits.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/meta/type_traits.hpp b/include/nlohmann/detail/meta/type_traits.hpp index 2b2b2d3ba..f9a5b75f8 100644 --- a/include/nlohmann/detail/meta/type_traits.hpp +++ b/include/nlohmann/detail/meta/type_traits.hpp @@ -5,11 +5,11 @@ #include // false_type, is_constructible, is_integral, is_same, true_type #include // declval -#include -#include -#include -#include -#include +#include "../iterators/iterator_traits.hpp" +#include "../macro_scope.hpp" +#include "../meta/cpp_future.hpp" +#include "../meta/detected.hpp" +#include "../../json_fwd.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/output/binary_writer.hpp b/include/nlohmann/detail/output/binary_writer.hpp index 29093dd37..1cc8fcb95 100644 --- a/include/nlohmann/detail/output/binary_writer.hpp +++ b/include/nlohmann/detail/output/binary_writer.hpp @@ -7,9 +7,9 @@ #include // numeric_limits #include // string -#include -#include -#include +#include "../input/binary_reader.hpp" +#include "../macro_scope.hpp" +#include "output_adapters.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/output/output_adapters.hpp b/include/nlohmann/detail/output/output_adapters.hpp index 71ca65b92..8716ec31d 100644 --- a/include/nlohmann/detail/output/output_adapters.hpp +++ b/include/nlohmann/detail/output/output_adapters.hpp @@ -8,7 +8,8 @@ #include // basic_ostream #include // basic_string #include // vector -#include + +#include "../macro_scope.hpp" namespace nlohmann { diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp index e6811ceb3..019883b45 100644 --- a/include/nlohmann/detail/output/serializer.hpp +++ b/include/nlohmann/detail/output/serializer.hpp @@ -14,13 +14,13 @@ #include // is_same #include // move -#include -#include -#include -#include -#include -#include -#include +#include "../conversions/to_chars.hpp" +#include "../exceptions.hpp" +#include "../macro_scope.hpp" +#include "../meta/cpp_future.hpp" +#include "binary_writer.hpp" +#include "output_adapters.hpp" +#include "../value_t.hpp" namespace nlohmann { diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index f5210a6b3..a6a88ee73 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -48,29 +48,29 @@ SOFTWARE. #include // declval, forward, move, pair, swap #include // vector -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "adl_serializer.hpp" +#include "detail/conversions/from_json.hpp" +#include "detail/conversions/to_json.hpp" +#include "detail/exceptions.hpp" +#include "detail/input/binary_reader.hpp" +#include "detail/input/input_adapters.hpp" +#include "detail/input/lexer.hpp" +#include "detail/input/parser.hpp" +#include "detail/iterators/internal_iterator.hpp" +#include "detail/iterators/iter_impl.hpp" +#include "detail/iterators/iteration_proxy.hpp" +#include "detail/iterators/json_reverse_iterator.hpp" +#include "detail/iterators/primitive_iterator.hpp" +#include "detail/json_pointer.hpp" +#include "detail/json_ref.hpp" +#include "detail/macro_scope.hpp" +#include "detail/meta/cpp_future.hpp" +#include "detail/meta/type_traits.hpp" +#include "detail/output/binary_writer.hpp" +#include "detail/output/output_adapters.hpp" +#include "detail/output/serializer.hpp" +#include "detail/value_t.hpp" +#include "json_fwd.hpp" /*! @brief namespace for Niels Lohmann @@ -8129,6 +8129,6 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std return nlohmann::json::json_pointer(std::string(s, n)); } -#include +#include "detail/macro_unscope.hpp" #endif // INCLUDE_NLOHMANN_JSON_HPP_