From 21563c7bfeb9c3612570f4c3443afa2b7834b5b6 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Mon, 27 Sep 2021 19:47:02 -0700 Subject: [PATCH] Rename CUDA scopes header to atomic_scopes.h --- libcxx/include/atomic | 2 +- .../support/atomic/{atomic_cuda_scopes.h => atomic_scopes.h} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename libcxx/include/support/atomic/{atomic_cuda_scopes.h => atomic_scopes.h} (93%) diff --git a/libcxx/include/atomic b/libcxx/include/atomic index 27217e51f4..7ca9731aaa 100644 --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -681,7 +681,7 @@ __cxx_atomic_assign_volatile(_Tp volatile& __a_value, _Tv volatile const& __val) // Headers are wrapped like so: (cuda::std::|std::)detail namespace __detail { #if defined(_LIBCUDACXX_HAS_CUDA_ATOMIC_EXT) -# include "support/atomic/atomic_cuda_scopes.h" +# include "support/atomic/atomic_scopes.h" #endif #if defined(_LIBCUDACXX_HAS_CUDA_ATOMIC_IMPL) diff --git a/libcxx/include/support/atomic/atomic_cuda_scopes.h b/libcxx/include/support/atomic/atomic_scopes.h similarity index 93% rename from libcxx/include/support/atomic/atomic_cuda_scopes.h rename to libcxx/include/support/atomic/atomic_scopes.h index 4d8e1477dd..89d73bb3f8 100644 --- a/libcxx/include/support/atomic/atomic_cuda_scopes.h +++ b/libcxx/include/support/atomic/atomic_scopes.h @@ -1,3 +1,6 @@ +#ifndef __LIBCUDACXX_ATOMIC_SCOPES_H +#define __LIBCUDACXX_ATOMIC_SCOPES_H + #ifndef __ATOMIC_BLOCK #define __ATOMIC_SYSTEM 0 // 0 indicates default #define __ATOMIC_DEVICE 1 @@ -39,3 +42,5 @@ _LIBCUDACXX_INLINE_VISIBILITY auto constexpr __scope_tag() -> typename __scope_enum_to_tag<_Scope>::type { return typename __scope_enum_to_tag<_Scope>::type(); } + +#endif // __LIBCUDACXX_ATOMIC_SCOPES_H