Experiment

NVIDIA · Jan 13, 2025 · 64b24cf · 64b24cf
1 parent 36f17eb
commit 64b24cf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/c2h/include/c2h/catch2_test_helper.h b/c2h/include/c2h/catch2_test_helper.h
@@ -61,7 +61,15 @@
 // * MSVC14.39: #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
 // * MSVC14.29: internal error: assertion failed: alloc_copy_of_pending_pragma: copied pragma has source sequence entry
 //              (pragma.c, line 526 in alloc_copy_of_pending_pragma)
-#if _CCCL_COMPILER(MSVC)
+#if _CCCL_COMPILER(MSVC, <, 19, 30)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION        _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION         _Pragma("diag pop")
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma("diag_suppress 177")
+#endif
+#if _CCCL_COMPILER(MSVC, >=, 19, 30)
 #  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS

diff --git a/cudax/test/common/testing.cuh b/cudax/test/common/testing.cuh
@@ -34,11 +34,21 @@
 // * MSVC14.39: #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
 // * MSVC14.29: internal error: assertion failed: alloc_copy_of_pending_pragma: copied pragma has source sequence entry
 //              (pragma.c, line 526 in alloc_copy_of_pending_pragma)
-#if _CCCL_COMPILER(MSVC)
+#if _CCCL_COMPILER(MSVC, <, 19, 30)
 #  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
 #  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION        _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION         _Pragma("diag pop")
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS _Pragma("diag_suppress 177")
+#endif
+#if _CCCL_COMPILER(MSVC, >=, 19, 30)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
 #  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
 #  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
 #endif
 
 namespace cuda::experimental::__async