From f6d07dda6b12c951db6d58e145b6315995501fc4 Mon Sep 17 00:00:00 2001
From: Michael Schellenberger Costa <miscco@nvidia.com>
Date: Wed, 31 May 2023 15:45:14 +0200
Subject: [PATCH] Address review comments

---
 include/cuda/std/detail/libcxx/include/__config           | 4 ++--
 .../detail/libcxx/include/__iterator/iterator_traits.h    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/cuda/std/detail/libcxx/include/__config b/include/cuda/std/detail/libcxx/include/__config
index 837d297a9f..acb9523f53 100644
--- a/include/cuda/std/detail/libcxx/include/__config
+++ b/include/cuda/std/detail/libcxx/include/__config
@@ -1370,12 +1370,12 @@ typedef __char32_t char32_t;
 #define _LIBCUDACXX_DEVICE __device__
 #define _LIBCUDACXX_HOST_DEVICE __host__ __device__
 #define _LIBCUDACXX_FORCE_INLINE __forceinline__
-#else // ^^^ __cuda_std__ ^^^ / vvv !__cuda_std__
+#else // ^^^ __CUDACC__ ^^^ / vvv !__CUDACC__
 #define _LIBCUDACXX_HOST
 #define _LIBCUDACXX_DEVICE
 #define _LIBCUDACXX_HOST_DEVICE
 #define _LIBCUDACXX_FORCE_INLINE
-#endif // !__cuda_std__
+#endif // !__CUDACC__
 
 // Just so we can migrate to the new macros gradually.
 
diff --git a/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h b/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h
index 50eb8db044..4e02ba8e72 100644
--- a/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h
+++ b/include/cuda/std/detail/libcxx/include/__iterator/iterator_traits.h
@@ -40,9 +40,9 @@ struct __has_iterator_typedefs
 private:
     struct __two {char __lx; char __lxx;};
     template <class _Up>
-    _LIBCUDACXX_HOST_DEVICE _LIBCUDACXX_INLINE_VISIBILITY static __two __test(...);
+    _LIBCUDACXX_INLINE_VISIBILITY static __two __test(...);
     template <class _Up>
-    _LIBCUDACXX_HOST_DEVICE _LIBCUDACXX_INLINE_VISIBILITY static char __test(
+    _LIBCUDACXX_INLINE_VISIBILITY static char __test(
         __void_t<typename _Up::iterator_category>* = 0,
     	__void_t<typename _Up::difference_type>* = 0,
     	__void_t<typename _Up::value_type>* = 0,
@@ -59,9 +59,9 @@ struct __has_iterator_category
 private:
     struct __two {char __lx; char __lxx;};
     template <class _Up>
-    _LIBCUDACXX_HOST_DEVICE _LIBCUDACXX_INLINE_VISIBILITY static __two __test(...);
+    _LIBCUDACXX_INLINE_VISIBILITY static __two __test(...);
     template <class _Up>
-    _LIBCUDACXX_HOST_DEVICE _LIBCUDACXX_INLINE_VISIBILITY static char __test(typename _Up::iterator_category* = 0);
+    _LIBCUDACXX_INLINE_VISIBILITY static char __test(typename _Up::iterator_category* = 0);
 public:
     static const bool value = sizeof(__test<_Tp>(0)) == 1;
 };