Merge pull request #1118 from NVIDIA/pragma-warnings

clean up of pragma warning suppression
NVIDIA · Oct 20, 2023 · e0b55ce · e0b55ce
2 parents 089ddcb + d9e0eff
commit e0b55ce
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/include/exec/__detail/__sender_facade.hpp b/include/exec/__detail/__sender_facade.hpp
@@ -17,11 +17,9 @@
 
 #include "../../stdexec/execution.hpp"
 
-#ifdef __EDG__
-#pragma diagnostic push
-#pragma diag_suppress 1302
-#pragma diag_suppress 497
-#endif
+STDEXEC_PRAGMA_PUSH()
+STDEXEC_PRAGMA_IGNORE_EDG(1302)
+STDEXEC_PRAGMA_IGNORE_EDG(497)
 
 namespace exec {
   struct _FAILURE_TO_CONNECT_ {
@@ -399,6 +397,4 @@ namespace exec {
   };
 } // namespace exec
 
-#ifdef __EDG__
-#pragma diagnostic pop
-#endif
+STDEXEC_PRAGMA_POP()
diff --git a/include/exec/env.hpp b/include/exec/env.hpp
@@ -17,10 +17,8 @@
 
 #include "../stdexec/execution.hpp"
 
-#ifdef __EDG__
-#pragma diagnostic push
-#pragma diag_suppress 1302
-#endif
+STDEXEC_PRAGMA_PUSH()
+STDEXEC_PRAGMA_IGNORE_EDG(1302)
 
 namespace exec {
   template <class _Tag, class _Value = void>
@@ -118,6 +116,4 @@ namespace exec {
   inline constexpr stdexec::__write_::__write_t write{};
 } // namespace exec
 
-#ifdef __EDG__
-#pragma diagnostic pop
-#endif
+STDEXEC_PRAGMA_POP()
diff --git a/include/stdexec/execution.hpp b/include/stdexec/execution.hpp
@@ -39,13 +39,6 @@
 #include "coroutine.hpp"
 #include "stop_token.hpp"
 
-#ifdef __EDG__
-#pragma diagnostic push
-#pragma diag_suppress 1302
-#pragma diag_suppress 497
-#pragma diag_suppress type_qualifiers_ignored_on_reference
-#endif
-
 #ifndef STDEXEC_DISABLE_R5_DEPRECATION_WARNINGS
 #define STDEXEC_R5_SENDER_DEPRECATION_WARNING \
   [[deprecated( \
@@ -89,6 +82,10 @@ STDEXEC_PRAGMA_IGNORE_GNU("-Wunknown-warning-option")
 STDEXEC_PRAGMA_IGNORE_GNU("-Wundefined-inline")
 STDEXEC_PRAGMA_IGNORE_GNU("-Wsubobject-linkage")
 
+STDEXEC_PRAGMA_IGNORE_EDG(1302)
+STDEXEC_PRAGMA_IGNORE_EDG(497)
+STDEXEC_PRAGMA_IGNORE_EDG(type_qualifiers_ignored_on_reference)
+
 namespace stdexec {
   // [exec.queries.queryable]
   template <class T>
@@ -7347,8 +7344,4 @@ auto operator|(stdexec::__ignore_sender, _Sender&&) noexcept -> stdexec::__ignor
 
 #include "__detail/__p2300.hpp"
 
-#ifdef __EDG__
-#pragma diagnostic pop
-#endif
-
 STDEXEC_PRAGMA_POP()