From 7c1bfbe7356124753efeea16cceab1f417615e11 Mon Sep 17 00:00:00 2001 From: Jonas Wittbrodt Date: Wed, 25 Aug 2021 13:25:18 +0200 Subject: [PATCH] switch signaling<>quiet NaN and add LCOV_EXCL to the architecture dependent branch --- .../nlohmann/detail/conversions/from_json.hpp | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp index 61c95cbe0..27b3feed5 100644 --- a/include/nlohmann/detail/conversions/from_json.hpp +++ b/include/nlohmann/detail/conversions/from_json.hpp @@ -59,17 +59,19 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val) } case value_t::null: { - if(std::numeric_limits::has_quiet_NaN) - { - val = std::numeric_limits::quiet_NaN(); - break; - } - else if(std::numeric_limits::has_signaling_NaN) + if(std::numeric_limits::has_signaling_NaN) { val = std::numeric_limits::signaling_NaN(); break; } + // LCOV_EXCL_START + else if(std::numeric_limits::has_quiet_NaN) + { + val = std::numeric_limits::quiet_NaN(); + break; + } // [[fallthrough]]; + // LCOV_EXCL_STOP } case value_t::object: @@ -364,17 +366,19 @@ void from_json(const BasicJsonType& j, ArithmeticType& val) } case value_t::null: { - if(std::numeric_limits::has_quiet_NaN) - { - val = std::numeric_limits::quiet_NaN(); - break; - } - else if(std::numeric_limits::has_signaling_NaN) + if(std::numeric_limits::has_signaling_NaN) { val = std::numeric_limits::signaling_NaN(); break; } + // LCOV_EXCL_START + else if(std::numeric_limits::has_quiet_NaN) + { + val = std::numeric_limits::quiet_NaN(); + break; + } // [[fallthrough]]; + // LCOV_EXCL_STOP } case value_t::object: