Backport std::size and std::data to C++14 and push span to C++14 …

…as well
NVIDIA · Sep 27, 2022 · 8837eee · 8837eee
1 parent df720c7
commit 8837eee
Show file tree

Hide file tree

Showing 35 changed files with 62 additions and 68 deletions.
diff --git a/.upstream-tests/test/std/views/views.span/span.cons/array.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/array.fail.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/array.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/array.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/assign.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/assign.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/copy.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/copy.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/default.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/default.fail.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/default.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/default.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/initializer_list.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/initializer_list.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===---------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.verify.cpp b/.upstream-tests/test/std/views/views.span/span.cons/iterator_len.verify.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===---------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/span.dtor.compile.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/span.dtor.compile.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/span.fail.cpp b/.upstream-tests/test/std/views/views.span/span.cons/span.fail.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/span.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/span.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.cons/stdarray.pass.cpp b/.upstream-tests/test/std/views/views.span/span.cons/stdarray.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.elem/back.pass.cpp b/.upstream-tests/test/std/views/views.span/span.elem/back.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.elem/data.pass.cpp b/.upstream-tests/test/std/views/views.span/span.elem/data.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.elem/front.pass.cpp b/.upstream-tests/test/std/views/views.span/span.elem/front.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.elem/op_idx.pass.cpp b/.upstream-tests/test/std/views/views.span/span.elem/op_idx.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.iterators/begin.pass.cpp b/.upstream-tests/test/std/views/views.span/span.iterators/begin.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.iterators/end.pass.cpp b/.upstream-tests/test/std/views/views.span/span.iterators/end.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.iterators/rbegin.pass.cpp b/.upstream-tests/test/std/views/views.span/span.iterators/rbegin.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.iterators/rend.pass.cpp b/.upstream-tests/test/std/views/views.span/span.iterators/rend.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.obs/empty.pass.cpp b/.upstream-tests/test/std/views/views.span/span.obs/empty.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.obs/size.pass.cpp b/.upstream-tests/test/std/views/views.span/span.obs/size.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.obs/size_bytes.pass.cpp b/.upstream-tests/test/std/views/views.span/span.obs/size_bytes.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/first.pass.cpp b/.upstream-tests/test/std/views/views.span/span.sub/first.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/first.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/first.verify.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/last.pass.cpp b/.upstream-tests/test/std/views/views.span/span.sub/last.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/last.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/last.verify.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/subspan.pass.cpp b/.upstream-tests/test/std/views/views.span/span.sub/subspan.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/.upstream-tests/test/std/views/views.span/span.sub/subspan.verify.cpp b/.upstream-tests/test/std/views/views.span/span.sub/subspan.verify.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // This test also generates spurious warnings when instantiating std::span
 // with a very large extent (like size_t(-2)) -- silence those.

diff --git a/.upstream-tests/test/std/views/views.span/trivially_copyable.compile.pass.cpp b/.upstream-tests/test/std/views/views.span/trivially_copyable.compile.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // P2251 was voted into C++23, but is supported even in C++20 mode by all vendors.
 

diff --git a/.upstream-tests/test/std/views/views.span/types.pass.cpp b/.upstream-tests/test/std/views/views.span/types.pass.cpp
@@ -6,7 +6,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
-// UNSUPPORTED: c++03
+// UNSUPPORTED: c++03, c++11
 
 // <span>
 

diff --git a/include/cuda/std/detail/libcxx/include/iterator b/include/cuda/std/detail/libcxx/include/iterator
@@ -1856,7 +1856,7 @@ end(const _Cp& __c)
 
 #endif  // !defined(_LIBCUDACXX_CXX03_LANG)
 
-#if _LIBCUDACXX_STD_VER > 14
+#if _LIBCUDACXX_STD_VER > 11
 
 // #if _LIBCUDACXX_STD_VER > 11
 // template <>
@@ -1932,7 +1932,7 @@ constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept { return __array; }
 template <class _Ep>
 _LIBCUDACXX_INLINE_VISIBILITY
 constexpr const _Ep* data(::std::initializer_list<_Ep> __il) noexcept { return __il.begin(); }
-#endif
+#endif // _LIBCUDACXX_STD_VER > 11
 
 _LIBCUDACXX_END_NAMESPACE_STD