Replace _CPPUNWIND with _HAS_EXCEPTIONS(#27, thanks @DBJDBJ)

See also martinmoene/nonstd-lite-project#48
martinmoene · Nov 15, 2020 · c5c7fe1 · c5c7fe1
1 parent aa59067
commit c5c7fe1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/include/nonstd/expected.hpp b/include/nonstd/expected.hpp
@@ -69,7 +69,10 @@
 // Control presence of exception handling (try and auto discover):
 
 #ifndef nsel_CONFIG_NO_EXCEPTIONS
-# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)
+# if _WIN32
+#  include <vcruntime.h>  // for _HAS_EXCEPTIONS
+# endif
+# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || (_HAS_EXCEPTIONS)
 #  define nsel_CONFIG_NO_EXCEPTIONS  0
 # else
 #  define nsel_CONFIG_NO_EXCEPTIONS  1