kokkos#253: remove MDSPAN_IMPL_NAMESPACE_STD and import dynamic_exten…

…t instead. This avoids clashes when using the std headers
nmm0 · May 1, 2023 · c91e0cc · c91e0cc
1 parent 83105bb
commit c91e0cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/include/experimental/__p0009_bits/dynamic_extent.hpp b/include/experimental/__p0009_bits/dynamic_extent.hpp
@@ -17,19 +17,19 @@
 
 #include "macros.hpp"
 
-#if defined(__cpp_lib_span) && defined(MDSPAN_IMPL_NAMESPACE_STD)
+#if defined(__cpp_lib_span)
 #include <span>
-#else
+#endif
 
 #include <cstddef>  // size_t
 #include <limits>   // numeric_limits
 
 namespace MDSPAN_IMPL_STANDARD_NAMESPACE {
-
+#if defined(__cpp_lib_span)
+using std::dynamic_extent;
+#else
 _MDSPAN_INLINE_VARIABLE constexpr auto dynamic_extent = std::numeric_limits<size_t>::max();
-
-} // namespace MDSPAN_IMPL_STANDARD_NAMESPACE
-
 #endif
+} // namespace MDSPAN_IMPL_STANDARD_NAMESPACE
 
 //==============================================================================================================
diff --git a/include/experimental/mdarray b/include/experimental/mdarray
@@ -24,6 +24,4 @@
   #define MDSPAN_IMPL_PROPOSED_NAMESPACE experimental
 #endif
 
-#define MDSPAN_IMPL_NAMESPACE_STD
-
 #include "../mdspan/experimental/mdarray.hpp"
diff --git a/include/experimental/mdspan b/include/experimental/mdspan
@@ -24,6 +24,4 @@
   #define MDSPAN_IMPL_PROPOSED_NAMESPACE experimental
 #endif
 
-#define MDSPAN_IMPL_NAMESPACE_STD
-
 #include "../mdspan/mdspan.hpp"