optional: use #if instead of #ifndef, fixes nlohmann#3859

Théo Delrieu · Théo Delrieu · commit ff7ed18ac0d3 · 2024-12-02T15:46:26.000+01:00
diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp
@@ -48,7 +48,7 @@ inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 }
 
 #ifdef JSON_HAS_CPP_17
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+#if !JSON_USE_IMPLICIT_CONVERSIONS
 template<typename BasicJsonType, typename T>
 void from_json(const BasicJsonType& j, std::optional<T>& opt)
 {
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -4721,7 +4721,7 @@ inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 }
 
 #ifdef JSON_HAS_CPP_17
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+#if !JSON_USE_IMPLICIT_CONVERSIONS
 template<typename BasicJsonType, typename T>
 void from_json(const BasicJsonType& j, std::optional<T>& opt)
 {
diff --git a/tests/src/unit-conversions.cpp b/tests/src/unit-conversions.cpp
@@ -1598,7 +1598,7 @@ TEST_CASE("JSON to enum mapping")
 
 
 #ifdef JSON_HAS_CPP_17
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+#if !JSON_USE_IMPLICIT_CONVERSIONS
 TEST_CASE("std::optional")
 {
     SECTION("null")

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`#ifdef JSON_HAS_CPP_17`
`51`		`-#ifndef JSON_USE_IMPLICIT_CONVERSIONS`
	`51`	`+#if !JSON_USE_IMPLICIT_CONVERSIONS`
`52`	`52`	`template<typename BasicJsonType, typename T>`
`53`	`53`	`void from_json(const BasicJsonType& j, std::optional<T>& opt)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4721,7 +4721,7 @@ inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)`
`4721`	`4721`	`}`
`4722`	`4722`
`4723`	`4723`	`#ifdef JSON_HAS_CPP_17`
`4724`		`-#ifndef JSON_USE_IMPLICIT_CONVERSIONS`
	`4724`	`+#if !JSON_USE_IMPLICIT_CONVERSIONS`
`4725`	`4725`	`template<typename BasicJsonType, typename T>`
`4726`	`4726`	`void from_json(const BasicJsonType& j, std::optional<T>& opt)`
`4727`	`4727`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ TEST_CASE("JSON to enum mapping")`
`1598`	`1598`
`1599`	`1599`
`1600`	`1600`	`#ifdef JSON_HAS_CPP_17`
`1601`		`-#ifndef JSON_USE_IMPLICIT_CONVERSIONS`
	`1601`	`+#if !JSON_USE_IMPLICIT_CONVERSIONS`
`1602`	`1602`	`TEST_CASE("std::optional")`
`1603`	`1603`	`{`
`1604`	`1604`	`SECTION("null")`