Skip to content
Snippets Groups Projects
Commit 0db99d5e authored by GitHub Actions's avatar GitHub Actions
Browse files

Upstream release v3.10.2

parent 0ad2ba44
No related branches found
Tags v3.10.2
No related merge requests found
......@@ -12,7 +12,7 @@ include(FetchContent)
FetchContent_Declare(json
GIT_REPOSITORY https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent
GIT_TAG v3.10.1)
GIT_TAG v3.10.2)
FetchContent_GetProperties(json)
if(NOT json_POPULATED)
......
/*
__ _____ _____ _____
__| | __| | | | 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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment