diff options
author | ArthurSonzogni <sonzogniarthur@gmail.com> | 2022-09-25 15:58:20 +0300 |
---|---|---|
committer | ArthurSonzogni <sonzogniarthur@gmail.com> | 2022-09-25 15:58:20 +0300 |
commit | 1bbf6e23726df22a84d69b75aa2f243039931a28 (patch) | |
tree | eb1e1f56924f3e0147013413c58ca55079989c9d | |
parent | 4a0e5870a08a36fc41a95255bd1f85d73dd4cf94 (diff) |
Upstream release v3.11.1v3.11.1
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | meson.build | 2 | ||||
-rw-r--r-- | single_include/nlohmann/json.hpp | 99 | ||||
-rw-r--r-- | single_include/nlohmann/json_fwd.hpp | 2 |
5 files changed, 54 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fd5c2bc..3b3aba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1) ## PROJECT ## name and version ## -project(nlohmann_json VERSION 3.11.0 LANGUAGES CXX) +project(nlohmann_json VERSION 3.11.1 LANGUAGES CXX) ## ## MAIN_PROJECT CHECK @@ -25,7 +25,7 @@ FetchContent_Declare(json GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent GIT_PROGRESS TRUE GIT_SHALLOW TRUE - GIT_TAG v3.11.0) + GIT_TAG v3.11.1) FetchContent_MakeAvailable(json) diff --git a/meson.build b/meson.build index 3cd7dc8..005e98e 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('nlohmann_json', 'cpp', - version : '3.11.0', + version : '3.11.1', license : 'MIT', ) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 8a8a0a0..e9bf475 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -1,6 +1,6 @@ // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -35,7 +35,7 @@ // #include <nlohmann/adl_serializer.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -48,7 +48,7 @@ // #include <nlohmann/detail/abi_macros.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -60,7 +60,7 @@ #ifndef JSON_SKIP_LIBRARY_VERSION_CHECK #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH) - #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 0 + #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 1 #warning "Already included a different version of the library!" #endif #endif @@ -68,7 +68,7 @@ #define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum) #define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum) -#define NLOHMANN_JSON_VERSION_PATCH 0 // NOLINT(modernize-macro-to-enum) +#define NLOHMANN_JSON_VERSION_PATCH 1 // NOLINT(modernize-macro-to-enum) #ifndef JSON_DIAGNOSTICS #define JSON_DIAGNOSTICS 0 @@ -129,7 +129,7 @@ // #include <nlohmann/detail/conversions/from_json.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -152,7 +152,7 @@ // #include <nlohmann/detail/exceptions.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -169,7 +169,7 @@ // #include <nlohmann/detail/value_t.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -185,7 +185,7 @@ // #include <nlohmann/detail/macro_scope.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -197,7 +197,7 @@ // #include <nlohmann/detail/meta/detected.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -210,7 +210,7 @@ // #include <nlohmann/detail/meta/void_t.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -297,7 +297,7 @@ NLOHMANN_JSON_NAMESPACE_END // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -2793,7 +2793,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP #endif #ifndef JSON_USE_GLOBAL_UDLS - #define JSON_USE_GLOBAL_UDLS 0 + #define JSON_USE_GLOBAL_UDLS 1 #endif #if JSON_HAS_THREE_WAY_COMPARISON @@ -2902,7 +2902,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/string_escape.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -2977,7 +2977,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/position_t.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3019,7 +3019,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/cpp_future.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3188,7 +3188,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/type_traits.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3204,7 +3204,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/iterator_traits.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3272,7 +3272,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/call_std/begin.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3292,7 +3292,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/call_std/end.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -3316,7 +3316,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/json_fwd.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -4060,7 +4060,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/string_concat.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -4447,7 +4447,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/identity_tag.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -4471,7 +4471,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/std_fs.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -4977,7 +4977,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/conversions/to_json.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -4997,7 +4997,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/iteration_proxy.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -5712,7 +5712,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/byte_container_with_subtype.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -5824,7 +5824,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/hash.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -5957,7 +5957,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/binary_reader.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -5984,7 +5984,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/input_adapters.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -6482,7 +6482,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/json_sax.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -7215,7 +7215,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/lexer.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -8854,7 +8854,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/meta/is_sax.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -11969,7 +11969,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/input/parser.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -12486,7 +12486,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/internal_iterator.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -12499,7 +12499,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/primitive_iterator.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -12658,7 +12658,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/iter_impl.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -13420,7 +13420,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/iterators/json_reverse_iterator.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -13555,7 +13555,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/json_pointer.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -14462,7 +14462,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/json_ref.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -14554,7 +14554,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/output/binary_writer.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -14580,7 +14580,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/output/output_adapters.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -16548,7 +16548,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/output/serializer.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2008-2009 Björn Hoehrmann <bjoern@hoehrmann.de> @@ -16573,7 +16573,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/detail/conversions/to_chars.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/> @@ -18669,7 +18669,7 @@ NLOHMANN_JSON_NAMESPACE_END // #include <nlohmann/ordered_map.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -19483,7 +19483,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec object = nullptr; // silence warning, see #821 if (JSON_HEDLEY_UNLIKELY(t == value_t::null)) { - JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.0", nullptr)); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.11.1", nullptr)); // LCOV_EXCL_LINE } break; } @@ -24123,13 +24123,14 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC } // namespace std #if JSON_USE_GLOBAL_UDLS - using namespace nlohmann::literals::json_literals; // NOLINT(build/namespaces_literals) + using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers) + using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers) #endif // #include <nlohmann/detail/macro_unscope.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> @@ -24173,7 +24174,7 @@ inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC // #include <nlohmann/thirdparty/hedley/hedley_undef.hpp> // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> diff --git a/single_include/nlohmann/json_fwd.hpp b/single_include/nlohmann/json_fwd.hpp index c6f2871..c7ad236 100644 --- a/single_include/nlohmann/json_fwd.hpp +++ b/single_include/nlohmann/json_fwd.hpp @@ -1,6 +1,6 @@ // __ _____ _____ _____ // __| | __| | | | JSON for Modern C++ -// | | |__ | | | | | | version 3.11.0 +// | | |__ | | | | | | version 3.11.1 // |_____|_____|_____|_|___| https://github.com/nlohmann/json // // SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me> |