From ff7ed18ac0d385b50c4059caa02cbc304f5e06e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?The=CC=81o=20Delrieu?= <theo.delrieu@metalgear.xyz>
Date: Mon, 2 Dec 2024 15:32:46 +0100
Subject: [PATCH] optional: use #if instead of #ifndef, fixes #3859

---
 include/nlohmann/detail/conversions/from_json.hpp | 2 +-
 single_include/nlohmann/json.hpp                  | 2 +-
 tests/src/unit-conversions.cpp                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/nlohmann/detail/conversions/from_json.hpp b/include/nlohmann/detail/conversions/from_json.hpp
index 522292247f..42240ea28d 100644
--- 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
index 02441416bf..e45958b819 100644
--- 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
index 9adbc935af..a713c93aa1 100644
--- 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")