Fix issues with formatting of plain forwarding headers

NVIDIA · May 3, 2024 · a4dc4ba · a4dc4ba
1 parent 9c74469
commit a4dc4ba
Show file tree

Hide file tree

Showing 38 changed files with 491 additions and 64 deletions.
diff --git a/libcudacxx/include/cuda/memory_resource b/libcudacxx/include/cuda/memory_resource
@@ -80,9 +80,10 @@ class resource_ref {
 */
 // clang-format on
 
-#include <cuda_runtime_api.h> // cuda_runtime_api needs to come first
+#include <cuda_runtime_api.h>
+// cuda_runtime_api needs to come first
 
-#include "__cccl_config"
+#include <cuda/std/detail/__config>
 
 #if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
 #  pragma GCC system_header

diff --git a/libcudacxx/include/cuda/std/__algorithm_ b/libcudacxx/include/cuda/std/__algorithm_
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/algorithm>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_ALGORITHM
diff --git a/libcudacxx/include/cuda/std/__exception_ b/libcudacxx/include/cuda/std/__exception_
@@ -8,12 +8,25 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _CUDA_STD_NEW
-#define _CUDA_STD_NEW
+#ifndef _CUDA_STD_EXCEPTION
+#define _CUDA_STD_EXCEPTION
 
-#include "detail/__config"
-#include "detail/__pragma_pop"
-#include "detail/__pragma_push"
-#include "detail/libcxx/include/exception"
+#include <cuda/std/detail/__config>
 
-#endif // _CUDA_STD_NEW
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
+#include <cuda/std/detail/__pragma_push>
+
+#include <cuda/std/detail/libcxx/include/exception>
+
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
+#endif // _CUDA_STD_EXCEPTION
diff --git a/libcudacxx/include/cuda/std/__memory_ b/libcudacxx/include/cuda/std/__memory_
@@ -11,9 +11,22 @@
 #ifndef _CUDA_STD_MEMORY
 #define _CUDA_STD_MEMORY
 
-#include "detail/__config"
-#include "detail/__pragma_pop"
-#include "detail/__pragma_push"
-#include "detail/libcxx/include/memory"
+#include <cuda/std/detail/__config>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
+#include <cuda/std/detail/__pragma_push>
+
+#include <cuda/std/detail/libcxx/include/memory>
+
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
 
 #endif // _CUDA_STD_MEMORY
diff --git a/libcudacxx/include/cuda/std/__new_ b/libcudacxx/include/cuda/std/__new_
@@ -11,9 +11,22 @@
 #ifndef _CUDA_STD_NEW
 #define _CUDA_STD_NEW
 
-#include "detail/__config"
-#include "detail/__pragma_pop"
-#include "detail/__pragma_push"
-#include "detail/libcxx/include/new"
+#include <cuda/std/detail/__config>
+
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
+#include <cuda/std/detail/__pragma_push>
+
+#include <cuda/std/detail/libcxx/include/new>
+
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
 
 #endif // _CUDA_STD_NEW
diff --git a/libcudacxx/include/cuda/std/array b/libcudacxx/include/cuda/std/array
@@ -12,8 +12,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/array>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_ARRAY
diff --git a/libcudacxx/include/cuda/std/atomic b/libcudacxx/include/cuda/std/atomic
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/atomic>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_ATOMIC
diff --git a/libcudacxx/include/cuda/std/barrier b/libcudacxx/include/cuda/std/barrier
@@ -17,8 +17,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/barrier>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_BARRIER
diff --git a/libcudacxx/include/cuda/std/bit b/libcudacxx/include/cuda/std/bit
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/bit>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_BIT
diff --git a/libcudacxx/include/cuda/std/cassert b/libcudacxx/include/cuda/std/cassert
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/cassert>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CASSERT
diff --git a/libcudacxx/include/cuda/std/cfloat b/libcudacxx/include/cuda/std/cfloat
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/cfloat>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CFLOAT
diff --git a/libcudacxx/include/cuda/std/chrono b/libcudacxx/include/cuda/std/chrono
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/chrono>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CHRONO
diff --git a/libcudacxx/include/cuda/std/climits b/libcudacxx/include/cuda/std/climits
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/climits>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CLIMITS
diff --git a/libcudacxx/include/cuda/std/cmath b/libcudacxx/include/cuda/std/cmath
@@ -12,8 +12,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/cmath>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CMATH
diff --git a/libcudacxx/include/cuda/std/complex b/libcudacxx/include/cuda/std/complex
@@ -12,8 +12,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/complex>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_COMPLEX
diff --git a/libcudacxx/include/cuda/std/concepts b/libcudacxx/include/cuda/std/concepts
@@ -12,8 +12,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/concepts>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CONCEPTS
diff --git a/libcudacxx/include/cuda/std/cstddef b/libcudacxx/include/cuda/std/cstddef
@@ -13,8 +13,20 @@
 
 #include <cuda/std/detail/__config>
 
-#include <cuda/std/detail/__pragma_pop>
+#if defined(_CCCL_IMPLICIT_SYSTEM_HEADER_GCC)
+#  pragma GCC system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_CLANG)
+#  pragma clang system_header
+#elif defined(_CCCL_IMPLICIT_SYSTEM_HEADER_MSVC)
+#  pragma system_header
+#endif // no system header
+
+// clang-format off
 #include <cuda/std/detail/__pragma_push>
+
 #include <cuda/std/detail/libcxx/include/cstddef>
 
+#include <cuda/std/detail/__pragma_pop>
+// clang-format on
+
 #endif // _CUDA_STD_CSTDDEF