Use the right define for internal traits

NVIDIA · Nov 6, 2024 · 558f642 · 558f642
1 parent 1643f61
commit 558f642
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/libcudacxx/include/cuda/std/__memory/allocator_traits.h b/libcudacxx/include/cuda/std/__memory/allocator_traits.h
@@ -42,22 +42,21 @@ _CCCL_NV_DIAG_SUPPRESS(1215)
 
 _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
-#if _CCCL_STD_VER <= 2014
+#if defined(_CCCL_NO_VARIABLE_TEMPLATES)
 #  define _LIBCUDACXX_ALLOCATOR_TRAITS_HAS_XXX(NAME, PROPERTY)   \
     template <class _Tp, class = void>                           \
     struct NAME : false_type                                     \
     {};                                                          \
     template <class _Tp>                                         \
     struct NAME<_Tp, void_t<typename _Tp::PROPERTY>> : true_type \
     {}
-
-#else // ^^^ _CCCL_STD_VER <= 2014 ^^^ / vvv _CCCL_STD_VER >= 2017 vvv
+#else // ^^^ _CCCL_NO_VARIABLE_TEMPLATES ^^^ / vvv !_CCCL_NO_VARIABLE_TEMPLATES vvv
 #  define _LIBCUDACXX_ALLOCATOR_TRAITS_HAS_XXX(NAME, PROPERTY) \
     template <class _Tp, class = void>                         \
-    inline constexpr bool NAME##_v = false;                    \
+    _CCCL_INLINE_VAR constexpr bool NAME##_v = false;          \
     template <class _Tp>                                       \
-    inline constexpr bool NAME##_v<_Tp, void_t<typename _Tp::PROPERTY>> = true;
-#endif // _CCCL_STD_VER >= 2017
+    _CCCL_INLINE_VAR constexpr bool NAME##_v<_Tp, void_t<typename _Tp::PROPERTY>> = true;
+#endif // !_CCCL_NO_VARIABLE_TEMPLATES
 
 // __pointer
 _LIBCUDACXX_ALLOCATOR_TRAITS_HAS_XXX(__has_pointer, pointer);

diff --git a/libcudacxx/include/cuda/std/__memory/uses_allocator.h b/libcudacxx/include/cuda/std/__memory/uses_allocator.h
@@ -28,7 +28,7 @@
 
 _LIBCUDACXX_BEGIN_NAMESPACE_STD
 
-#if _CCCL_STD_VER <= 2014
+#if defined(_CCCL_NO_VARIABLE_TEMPLATES)
 template <class _Tp, class = void>
 struct __has_allocator_type : false_type
 {};
@@ -42,7 +42,7 @@ struct __uses_allocator : false_type
 template <class _Tp, class _Alloc>
 struct __uses_allocator<_Tp, _Alloc, true> : is_convertible<_Alloc, typename _Tp::allocator_type>
 {};
-#else // ^^^ _CCCL_STD_VER <= 2014 ^^^ / vvv _CCCL_STD_VER >= 2017 vvv
+#else // ^^^ _CCCL_NO_VARIABLE_TEMPLATES ^^^ / vvv !_CCCL_NO_VARIABLE_TEMPLATES vvv
 template <class _Tp, class = void>
 _CCCL_INLINE_VAR constexpr bool __has_allocator_type_v = false;
 template <class _Tp>
@@ -53,7 +53,7 @@ _CCCL_INLINE_VAR constexpr bool __uses_allocator_v = false;
 template <class _Tp, class _Alloc>
 _CCCL_INLINE_VAR constexpr bool __uses_allocator_v<_Tp, _Alloc, true> =
   is_convertible_v<_Alloc, typename _Tp::allocator_type>;
-#endif // _CCCL_STD_VER >= 2017
+#endif // !_CCCL_NO_VARIABLE_TEMPLATES
 
 template <class _Tp, class _Alloc>
 struct _CCCL_TYPE_VISIBILITY_DEFAULT uses_allocator