Merge 9eb17be into 3326937

srz-zumix · Sep 6, 2020 · 501f368 · 501f368
2 parents 3326937 + 9eb17be
commit 501f368
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -115,6 +115,8 @@ stages:
       - job: visual_studio_test
         strategy:
           matrix:
+            NO_EXCEPTION_HANDLER:
+              CMAKE_OPTIONS: -Dbuild_gtest_samples=ON -DCMAKE_CXX_FLAGS="/EHs-c-"
             USE_EXPERIMENTAL:
               CMAKE_OPTIONS: -Dbuild_gtest_samples=ON -Dbuild_use_experimental=ON
         pool:

diff --git a/include/internal/iutest_compiler.hpp b/include/internal/iutest_compiler.hpp
@@ -798,7 +798,11 @@
 // c++
 //! has exceptions
 #if !defined(IUTEST_HAS_EXCEPTIONS)
-#  if   defined(_MSC_VER) || defined(__BORLANDC__)
+#  if   defined(_MSC_VER)
+#    if defined(_CPPUNWIND) && _CPPUNWIND
+#      define IUTEST_HAS_EXCEPTIONS 1
+#    endif
+#  elif defined(__BORLANDC__)
 #    ifndef _HAS_EXCEPTIONS
 #      define _HAS_EXCEPTIONS       1
 #    endif