fixes cuda 11.5

correaa · Feb 18, 2025 · 67d145b · 67d145b
1 parent 6e2ad67
commit 67d145b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/include/boost/multi/detail/tuple_zip.hpp b/include/boost/multi/detail/tuple_zip.hpp
@@ -303,15 +303,6 @@ constexpr auto get(tuple<T0, Ts...> const& t) -> auto const& {  // NOLINT(readab
 		return get<N - 1>(t.tail());
 	}
 }
-#if defined __NVCC__
-#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
-#pragma nv_diagnostic pop
-#else
-#pragma diagnostic pop
-#endif
-#elif defined      __NVCOMPILER
-#pragma diagnostic pop
-#endif
 
 template<std::size_t N, class T0, class... Ts>
 constexpr auto get(tuple<T0, Ts...>& tup) -> auto& {
@@ -330,6 +321,17 @@ constexpr auto get(tuple<T0, Ts...>&& tup) -> auto&& {
 		return get<N - 1>(std::move(std::move(tup).tail()));
 	}
 }
+
+#if defined __NVCC__
+#ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
+#pragma nv_diagnostic pop
+#else
+#pragma diagnostic pop
+#endif
+#elif defined      __NVCOMPILER
+#pragma diagnostic pop
+#endif
+
 #if ! defined(_MSC_VER)
 #pragma GCC diagnostic pop
 #endif

diff --git a/test/array_cref.cpp b/test/array_cref.cpp
@@ -4,7 +4,7 @@
 // https://www.boost.org/LICENSE_1_0.txt
 
 #ifdef __NVCC__  // affects cuda 11.4.3
-#pragma diag_suppress 20014  // error #20014-D: calling a __host__ function from a __host__ __device__ function is not allowed
+#pragma nv_diag_suppress 20014  // error #20014-D: calling a __host__ function from a __host__ __device__ function is not allowed
 #endif
 
 #include <boost/multi/array.hpp>  // for array, array_ref, subarray, arra...