Fix failing test

nlohmann · Mar 19, 2024 · d27adfd · d27adfd
1 parent 878745a
commit d27adfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp
@@ -53,7 +53,7 @@ void from_json(const BasicJsonType& j, std::optional<T>& opt)
     }
     else
     {
-        opt = j.template get<T>();
+        opt.emplace(j.template get<T>());
     }
 }
 #endif

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -2407,6 +2407,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 #if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
     #pragma GCC diagnostic push
     #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
 #ifdef __has_include
     #if __has_include(<version>)
         #include <version>
@@ -4624,7 +4625,7 @@ void from_json(const BasicJsonType& j, std::optional<T>& opt)
     }
     else
     {
-        opt = j.template get<T>();
+        opt.emplace(j.template get<T>());
     }
 }
 #endif

diff --git a/tests/src/unit-conversions.cpp b/tests/src/unit-conversions.cpp
@@ -1578,7 +1578,7 @@ TEST_CASE("std::optional")
         std::optional<std::string> opt_null;
 
         CHECK(json(opt_null) == j_null);
-        CHECK(std::optional<std::string>(j_null) == std::nullopt);
+        CHECK(j_null.get<std::optional<std::string>>() == std::nullopt);
     }
 
     SECTION("string")