Replace _CPPUNWIND with _HAS_EXCEPTIONS (thanks @DBJDBJ)

See also martinmoene/nonstd-lite-project#48
martinmoene · Nov 16, 2020 · 0e7e5e0 · 0e7e5e0
1 parent 6e97e81
commit 0e7e5e0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/include/nonstd/value_ptr.hpp b/include/nonstd/value_ptr.hpp
@@ -29,7 +29,10 @@
 // Control presence of exception handling (try and auto discover):
 
 #ifndef nsvp_CONFIG_NO_EXCEPTIONS
-# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)
+# if _MSC_VER
+# include <cstddef>     // for _HAS_EXCEPTIONS
+# endif
+# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || (_HAS_EXCEPTIONS)
 #  define nsvp_CONFIG_NO_EXCEPTIONS  0
 # else
 #  define nsvp_CONFIG_NO_EXCEPTIONS  1