diff options
| author | ArthurSonzogni <sonzogniarthur@gmail.com> | 2022-09-25 15:56:38 +0300 |
|---|---|---|
| committer | ArthurSonzogni <sonzogniarthur@gmail.com> | 2022-09-25 15:56:38 +0300 |
| commit | 5cb87307d307f057381cf0631a55cda48c7992c4 (patch) | |
| tree | 8461453d3547e23d9ccb1d616ba5708b50bc4530 | |
| parent | 3f50bbefff2caf6aac449daff229d906aff45546 (diff) | |
Upstream release v3.10.2v3.10.2
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | include/nlohmann/json.hpp | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -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.10.1) + GIT_TAG v3.10.2) FetchContent_MakeAvailable(json) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 5ba4a4b..8959265 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.10.1 +| | |__ | | | | | | version 3.10.2 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License <http://opensource.org/licenses/MIT>. @@ -32,7 +32,7 @@ SOFTWARE. #define NLOHMANN_JSON_VERSION_MAJOR 3 #define NLOHMANN_JSON_VERSION_MINOR 10 -#define NLOHMANN_JSON_VERSION_PATCH 1 +#define NLOHMANN_JSON_VERSION_PATCH 2 #include <algorithm> // all_of, find, for_each #include <cstddef> // nullptr_t, ptrdiff_t, size_t @@ -2514,6 +2514,10 @@ JSON_HEDLEY_DIAGNOSTIC_POP #define JSON_EXPLICIT explicit #endif +#ifndef JSON_DIAGNOSTICS + #define JSON_DIAGNOSTICS 0 +#endif + namespace nlohmann { @@ -18466,7 +18470,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.10.1", basic_json())); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.2", basic_json())); // LCOV_EXCL_LINE } break; } |