Replace _CPPUNWIND with _HAS_EXCEPTIONS (thanks @DBJDBJ)

See also martinmoene/nonstd-lite-project#48
martinmoene · Nov 16, 2020 · f4bd1d2 · f4bd1d2
1 parent c0d0747
commit f4bd1d2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/include/nonstd/optional.hpp b/include/nonstd/optional.hpp
@@ -31,7 +31,13 @@
 // Control presence of exception handling (try and auto discover):
 
 #ifndef optional_CONFIG_NO_EXCEPTIONS
-# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)
+# if _MSC_VER
+#  include <vcruntime.h>  // for _HAS_EXCEPTIONS
+# endif
+# if _MSC_VER
+#  include <vcruntime.h>  // for _HAS_EXCEPTIONS
+# endif
+# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || (_HAS_EXCEPTIONS)
 #  define optional_CONFIG_NO_EXCEPTIONS  0
 # else
 #  define optional_CONFIG_NO_EXCEPTIONS  1