From e8dbd7be86e3dbbacd9c8cd4dd8c7a2340217d91 Mon Sep 17 00:00:00 2001 From: raduteo <57729561+raduteo@users.noreply.github.com> Date: Fri, 9 Apr 2021 09:35:58 -0400 Subject: [PATCH 1/2] Update json.hpp Proposed fix for #2706 --- single_include/nlohmann/json.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 4493dd6542..7ef4befb29 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -18145,9 +18145,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec })); } JSON_CATCH(...) {} // LCOV_EXCL_LINE -#else - static_cast(check_parents); #endif + static_cast(check_parents); } void set_parents() From 35d79203ecafc0fbb5578c037184990512cf9fff Mon Sep 17 00:00:00 2001 From: raduteo <57729561+raduteo@users.noreply.github.com> Date: Mon, 12 Apr 2021 19:47:02 -0400 Subject: [PATCH 2/2] Update json.hpp --- include/nlohmann/json.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 3c9fa9199a..06ff303294 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1256,9 +1256,8 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec })); } JSON_CATCH(...) {} // LCOV_EXCL_LINE -#else - static_cast(check_parents); #endif + static_cast(check_parents); } void set_parents()