Merge pull request #290 from arximboldi/fix-exception-detect

Fix exception detection code
arximboldi · Sep 17, 2024 · 6f8b3d4 · 6f8b3d4
2 parents efbbbf3 + 41308e2
commit 6f8b3d4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/immer/config.hpp b/immer/config.hpp
@@ -22,8 +22,12 @@
 #endif
 #endif
 
-#ifdef __has_feature
-#if !__has_feature(cxx_exceptions)
+#if defined(_MSC_VER)
+#if !_HAS_EXCEPTIONS
+#define IMMER_NO_EXCEPTIONS
+#endif
+#else
+#if !__cpp_exceptions
 #define IMMER_NO_EXCEPTIONS
 #endif
 #endif