From 11165ef68d51a04c27954d9cf92cdad30dbda75c Mon Sep 17 00:00:00 2001
From: Harinath Nampally <harinath922@gmail.com>
Date: Sun, 26 Jan 2025 18:13:37 -0500
Subject: [PATCH] address review comments

Signed-off-by: Harinath Nampally <harinath922@gmail.com>
---
 .../nlohmann_json_serialize_enum_strict.cpp      |  7 -------
 docs/mkdocs/docs/features/enum_conversion.md     |  2 +-
 include/nlohmann/detail/macro_scope.hpp          | 16 +---------------
 single_include/nlohmann/json.hpp                 | 16 +---------------
 4 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.cpp b/docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.cpp
index 723d7b86f..caf2408b6 100644
--- a/docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.cpp
+++ b/docs/mkdocs/docs/examples/nlohmann_json_serialize_enum_strict.cpp
@@ -1,13 +1,6 @@
 #include <iostream>
 #include <nlohmann/json.hpp>
 
-#if !defined(JSON_NOEXCEPTION) && !defined(JSON_THROW_USER) && !defined(JSON_THROW)
-    #define JSON_THROW(exception) throw exception
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-#endif
-
 using json = nlohmann::json;
 
 namespace ns
diff --git a/docs/mkdocs/docs/features/enum_conversion.md b/docs/mkdocs/docs/features/enum_conversion.md
index 26dc5451b..709abc2ee 100644
--- a/docs/mkdocs/docs/features/enum_conversion.md
+++ b/docs/mkdocs/docs/features/enum_conversion.md
@@ -60,7 +60,7 @@ Other Important points:
   map will be returned when converting to or from JSON.
 - To disable the default serialization of enumerators as integers and force a compiler error instead, see [`JSON_DISABLE_ENUM_SERIALIZATION`](../api/macros/json_disable_enum_serialization.md).
 
-An alternative macro [`NLOHMANN_JSON_SERIALIZE_ENUM_STRICT()` macro](../api/macros/nlohmann_json_serialize_enum.md) can be used when a more strict error handling is preffered, throwing in case of serialization errors instead of defaulting to the first enum value defined in the macro.
+An alternative macro [`NLOHMANN_JSON_SERIALIZE_ENUM_STRICT()` macro](../api/macros/nlohmann_json_serialize_enum.md) can be used when a more strict error handling is preferred, throwing in case of serialization errors instead of defaulting to the first enum value defined in the macro.
 
 ## Usage
 ```cpp
diff --git a/include/nlohmann/detail/macro_scope.hpp b/include/nlohmann/detail/macro_scope.hpp
index 9389c32b0..ff302dc48 100644
--- a/include/nlohmann/detail/macro_scope.hpp
+++ b/include/nlohmann/detail/macro_scope.hpp
@@ -17,20 +17,6 @@
 
 #include <nlohmann/detail/abi_macros.hpp>
 
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
     #if defined(__clang__)
@@ -182,6 +168,7 @@
     #define JSON_INTERNAL_CATCH(exception) catch(exception)
 #else
     #include <cstdlib>
+    std::forward<T>(exception);
     #define JSON_THROW(exception) std::abort()
     #define JSON_TRY if(true)
     #define JSON_CATCH(exception) if(false)
@@ -262,7 +249,6 @@ namespace detail
 template<typename T>
 [[noreturn]] inline void json_throw_from_serialize_macro(T&& exception)
 {
-    static_cast<void>(exception);
     JSON_THROW(std::forward<T>(exception));
 }
 } // namespace detail
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 300f21f91..de3902b21 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -2383,20 +2383,6 @@ JSON_HEDLEY_DIAGNOSTIC_POP
 // #include <nlohmann/detail/abi_macros.hpp>
 
 
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
 // exclude unsupported compilers
 #if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
     #if defined(__clang__)
@@ -2548,6 +2534,7 @@ JSON_HEDLEY_DIAGNOSTIC_POP
     #define JSON_INTERNAL_CATCH(exception) catch(exception)
 #else
     #include <cstdlib>
+    std::forward<T>(exception);
     #define JSON_THROW(exception) std::abort()
     #define JSON_TRY if(true)
     #define JSON_CATCH(exception) if(false)
@@ -2628,7 +2615,6 @@ namespace detail
 template<typename T>
 [[noreturn]] inline void json_throw_from_serialize_macro(T&& exception)
 {
-    static_cast<void>(exception);
     JSON_THROW(std::forward<T>(exception));
 }
 } // namespace detail