Use relative path

This commit is contained in:
Timur Aitov 2019-11-05 15:07:29 +03:00
parent 53c3eefa2c
commit 2afbaacd8e
25 changed files with 97 additions and 95 deletions

View File

@ -2,8 +2,8 @@
#include <utility> #include <utility>
#include <nlohmann/detail/conversions/from_json.hpp> #include "detail/conversions/from_json.hpp"
#include <nlohmann/detail/conversions/to_json.hpp> #include "detail/conversions/to_json.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -13,11 +13,11 @@
#include <utility> // pair, declval #include <utility> // pair, declval
#include <valarray> // valarray #include <valarray> // valarray
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
#include <nlohmann/detail/meta/type_traits.hpp> #include "../meta/type_traits.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -8,7 +8,8 @@
#include <cstring> // memcpy, memmove #include <cstring> // memcpy, memmove
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <type_traits> // conditional #include <type_traits> // conditional
#include <nlohmann/detail/macro_scope.hpp>
#include "../macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -10,10 +10,10 @@
#include <valarray> // valarray #include <valarray> // valarray
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/iterators/iteration_proxy.hpp> #include "../iterators/iteration_proxy.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
#include <nlohmann/detail/meta/type_traits.hpp> #include "../meta/type_traits.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -4,8 +4,8 @@
#include <stdexcept> // runtime_error #include <stdexcept> // runtime_error
#include <string> // to_string #include <string> // to_string
#include <nlohmann/detail/input/position_t.hpp> #include "input/position_t.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -13,12 +13,12 @@
#include <string> // char_traits, string #include <string> // char_traits, string
#include <utility> // make_pair, move #include <utility> // make_pair, move
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/input/input_adapters.hpp> #include "input_adapters.hpp"
#include <nlohmann/detail/input/json_sax.hpp> #include "json_sax.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/is_sax.hpp> #include "../meta/is_sax.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -13,8 +13,8 @@
#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer #include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
#include <utility> // pair, declval #include <utility> // pair, declval
#include <nlohmann/detail/iterators/iterator_traits.hpp> #include "../iterators/iterator_traits.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -6,8 +6,8 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -10,9 +10,9 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/input/input_adapters.hpp> #include "input_adapters.hpp"
#include <nlohmann/detail/input/position_t.hpp> #include "position_t.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -8,13 +8,13 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/input/input_adapters.hpp> #include "input_adapters.hpp"
#include <nlohmann/detail/input/json_sax.hpp> #include "json_sax.hpp"
#include <nlohmann/detail/input/lexer.hpp> #include "lexer.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/is_sax.hpp> #include "../meta/is_sax.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include "primitive_iterator.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -4,13 +4,13 @@
#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
#include <type_traits> // conditional, is_const, remove_const #include <type_traits> // conditional, is_const, remove_const
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/iterators/internal_iterator.hpp> #include "internal_iterator.hpp"
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include "primitive_iterator.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
#include <nlohmann/detail/meta/type_traits.hpp> #include "../meta/type_traits.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -5,8 +5,8 @@
#include <string> // string, to_string #include <string> // string, to_string
#include <tuple> // tuple_size, get, tuple_element #include <tuple> // tuple_size, get, tuple_element
#include <nlohmann/detail/meta/type_traits.hpp> #include "../meta/type_traits.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -2,8 +2,8 @@
#include <iterator> // random_access_iterator_tag #include <iterator> // random_access_iterator_tag
#include <nlohmann/detail/meta/void_t.hpp> #include "../meta/void_t.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -8,9 +8,9 @@
#include <utility> // move #include <utility> // move
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/exceptions.hpp> #include "exceptions.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "macro_scope.hpp"
#include <nlohmann/detail/value_t.hpp> #include "value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -3,7 +3,7 @@
#include <initializer_list> #include <initializer_list>
#include <utility> #include <utility>
#include <nlohmann/detail/meta/type_traits.hpp> #include "meta/type_traits.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <utility> // pair #include <utility> // pair
#include <nlohmann/thirdparty/hedley/hedley.hpp> #include "../thirdparty/hedley/hedley.hpp"
// This file contains all internal macro definitions // This file contains all internal macro definitions
// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them // You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them

View File

@ -18,4 +18,4 @@
#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
#undef NLOHMANN_BASIC_JSON_TPL #undef NLOHMANN_BASIC_JSON_TPL
#include <nlohmann/thirdparty/hedley/hedley_undef.hpp> #include "../thirdparty/hedley/hedley_undef.hpp"

View File

@ -2,7 +2,7 @@
#include <type_traits> #include <type_traits>
#include <nlohmann/detail/meta/void_t.hpp> #include "void_t.hpp"
// http://en.cppreference.com/w/cpp/experimental/is_detected // http://en.cppreference.com/w/cpp/experimental/is_detected
namespace nlohmann namespace nlohmann

View File

@ -4,8 +4,8 @@
#include <utility> // declval #include <utility> // declval
#include <string> // string #include <string> // string
#include <nlohmann/detail/meta/detected.hpp> #include "detected.hpp"
#include <nlohmann/detail/meta/type_traits.hpp> #include "type_traits.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -5,11 +5,11 @@
#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
#include <utility> // declval #include <utility> // declval
#include <nlohmann/detail/iterators/iterator_traits.hpp> #include "../iterators/iterator_traits.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
#include <nlohmann/detail/meta/detected.hpp> #include "../meta/detected.hpp"
#include <nlohmann/json_fwd.hpp> #include "../../json_fwd.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -7,9 +7,9 @@
#include <limits> // numeric_limits #include <limits> // numeric_limits
#include <string> // string #include <string> // string
#include <nlohmann/detail/input/binary_reader.hpp> #include "../input/binary_reader.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/output/output_adapters.hpp> #include "output_adapters.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -8,7 +8,8 @@
#include <ostream> // basic_ostream #include <ostream> // basic_ostream
#include <string> // basic_string #include <string> // basic_string
#include <vector> // vector #include <vector> // vector
#include <nlohmann/detail/macro_scope.hpp>
#include "../macro_scope.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -14,13 +14,13 @@
#include <type_traits> // is_same #include <type_traits> // is_same
#include <utility> // move #include <utility> // move
#include <nlohmann/detail/conversions/to_chars.hpp> #include "../conversions/to_chars.hpp"
#include <nlohmann/detail/exceptions.hpp> #include "../exceptions.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "../macro_scope.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "../meta/cpp_future.hpp"
#include <nlohmann/detail/output/binary_writer.hpp> #include "binary_writer.hpp"
#include <nlohmann/detail/output/output_adapters.hpp> #include "output_adapters.hpp"
#include <nlohmann/detail/value_t.hpp> #include "../value_t.hpp"
namespace nlohmann namespace nlohmann
{ {

View File

@ -48,29 +48,29 @@ SOFTWARE.
#include <utility> // declval, forward, move, pair, swap #include <utility> // declval, forward, move, pair, swap
#include <vector> // vector #include <vector> // vector
#include <nlohmann/adl_serializer.hpp> #include "adl_serializer.hpp"
#include <nlohmann/detail/conversions/from_json.hpp> #include "detail/conversions/from_json.hpp"
#include <nlohmann/detail/conversions/to_json.hpp> #include "detail/conversions/to_json.hpp"
#include <nlohmann/detail/exceptions.hpp> #include "detail/exceptions.hpp"
#include <nlohmann/detail/input/binary_reader.hpp> #include "detail/input/binary_reader.hpp"
#include <nlohmann/detail/input/input_adapters.hpp> #include "detail/input/input_adapters.hpp"
#include <nlohmann/detail/input/lexer.hpp> #include "detail/input/lexer.hpp"
#include <nlohmann/detail/input/parser.hpp> #include "detail/input/parser.hpp"
#include <nlohmann/detail/iterators/internal_iterator.hpp> #include "detail/iterators/internal_iterator.hpp"
#include <nlohmann/detail/iterators/iter_impl.hpp> #include "detail/iterators/iter_impl.hpp"
#include <nlohmann/detail/iterators/iteration_proxy.hpp> #include "detail/iterators/iteration_proxy.hpp"
#include <nlohmann/detail/iterators/json_reverse_iterator.hpp> #include "detail/iterators/json_reverse_iterator.hpp"
#include <nlohmann/detail/iterators/primitive_iterator.hpp> #include "detail/iterators/primitive_iterator.hpp"
#include <nlohmann/detail/json_pointer.hpp> #include "detail/json_pointer.hpp"
#include <nlohmann/detail/json_ref.hpp> #include "detail/json_ref.hpp"
#include <nlohmann/detail/macro_scope.hpp> #include "detail/macro_scope.hpp"
#include <nlohmann/detail/meta/cpp_future.hpp> #include "detail/meta/cpp_future.hpp"
#include <nlohmann/detail/meta/type_traits.hpp> #include "detail/meta/type_traits.hpp"
#include <nlohmann/detail/output/binary_writer.hpp> #include "detail/output/binary_writer.hpp"
#include <nlohmann/detail/output/output_adapters.hpp> #include "detail/output/output_adapters.hpp"
#include <nlohmann/detail/output/serializer.hpp> #include "detail/output/serializer.hpp"
#include <nlohmann/detail/value_t.hpp> #include "detail/value_t.hpp"
#include <nlohmann/json_fwd.hpp> #include "json_fwd.hpp"
/*! /*!
@brief namespace for Niels Lohmann @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)); return nlohmann::json::json_pointer(std::string(s, n));
} }
#include <nlohmann/detail/macro_unscope.hpp> #include "detail/macro_unscope.hpp"
#endif // INCLUDE_NLOHMANN_JSON_HPP_ #endif // INCLUDE_NLOHMANN_JSON_HPP_