Rewrite

Author: jeremy-rifkin

test/unit/tracing/try_catch.cpp

@@ -79,7 +79,7 @@ TEST(TryCatch, Basic) {
         [&] (const std::runtime_error& e) {
             did_catch = true;
             EXPECT_EQ(e.what(), std::string("foobar"));
-            #if !defined(_WIN32) || (!defined(_M_ARM64) && !defined(_M_ARM))
+            #if !(defined(_WIN32) && (defined(_M_ARM64) || defined(_M_ARM)))
              check_trace(cpptrace::from_current_exception(), "try_catch.cpp", line);
             #endif
             check_trace(cpptrace::from_current_exception(), test_name);
@@ -113,7 +113,7 @@ TEST(TryCatch, Upcast) {
         [&] (const std::exception& e) {
             did_catch = true;
             EXPECT_EQ(e.what(), std::string("foobar"));
-            #if !defined(_WIN32) || (!defined(_M_ARM64) && !defined(_M_ARM))
+            #if !(defined(_WIN32) && (defined(_M_ARM64) || defined(_M_ARM)))
              check_trace(cpptrace::from_current_exception(), "try_catch.cpp", line);
             #endif
             check_trace(cpptrace::from_current_exception(), test_name);
@@ -177,7 +177,7 @@ TEST(TryCatch, CorrectHandler) {
         [&] (const std::runtime_error& e) {
             did_catch = true;
             EXPECT_EQ(e.what(), std::string("foobar"));
-            #if !defined(_WIN32) || (!defined(_M_ARM64) && !defined(_M_ARM))
+            #if !(defined(_WIN32) && (defined(_M_ARM64) || defined(_M_ARM)))
              check_trace(cpptrace::from_current_exception(), "try_catch.cpp", line);
             #endif
             check_trace(cpptrace::from_current_exception(), test_name);
@@ -209,7 +209,7 @@ TEST(TryCatch, BlanketHandler) {
         },
         [&] () {
             did_catch = true;
-            #if !defined(_WIN32) || (!defined(_M_ARM64) && !defined(_M_ARM))
+            #if !(defined(_WIN32) && (defined(_M_ARM64) || defined(_M_ARM)))
              check_trace(cpptrace::from_current_exception(), "try_catch.cpp", line);
             #endif
             check_trace(cpptrace::from_current_exception(), test_name);
@@ -235,7 +235,7 @@ TEST(TryCatch, CatchOrdering) {
         },
         [&] () {
             did_catch = true;
-            #if !defined(_WIN32) || (!defined(_M_ARM64) && !defined(_M_ARM))
+            #if !(defined(_WIN32) && (defined(_M_ARM64) || defined(_M_ARM)))
              check_trace(cpptrace::from_current_exception(), "try_catch.cpp", line);
             #endif
             check_trace(cpptrace::from_current_exception(), test_name);