[libcxx-commits] [libcxx] b31886a - [libc++][ranges] Backport P2711R1: Making multi-param constructors of views explicit (#190513)
via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Jun 23 08:39:33 PDT 2026
Author: Hristo Hristov
Date: 2026-06-23T11:39:28-04:00
New Revision: b31886a2af71590b00d13a082b80e7a4a347c1c4
URL: https://github.com/llvm/llvm-project/commit/b31886a2af71590b00d13a082b80e7a4a347c1c4
DIFF: https://github.com/llvm/llvm-project/commit/b31886a2af71590b00d13a082b80e7a4a347c1c4.diff
LOG: [libc++][ranges] Backport P2711R1: Making multi-param constructors of views explicit (#190513)
As discussed in https://gcc.gnu.org/PR114298 - GCC and MSVC STL
implemented P2711R1 as a DR. This PR does the same for libc++.
Co-authored-by: A. Jiang <de34 at live.cn>
Added:
Modified:
libcxx/docs/Status/Cxx23Papers.csv
libcxx/include/__config
libcxx/include/__ranges/drop_view.h
libcxx/include/__ranges/drop_while_view.h
libcxx/include/__ranges/filter_view.h
libcxx/include/__ranges/iota_view.h
libcxx/include/__ranges/lazy_split_view.h
libcxx/include/__ranges/split_view.h
libcxx/include/__ranges/take_view.h
libcxx/include/__ranges/take_while_view.h
libcxx/include/__ranges/transform_view.h
libcxx/test/std/ranges/range.adaptors/range.drop.while/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.filter/ctor.view_pred.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.range.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.split/ctor.range.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.split/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.take.while/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.take/ctor.view_count.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/ctor.view_function.pass.cpp
libcxx/test/std/ranges/range.factories/range.iota.view/ctor.first.last.pass.cpp
libcxx/test/std/ranges/range.factories/range.iota.view/ctor.value.bound.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/docs/Status/Cxx23Papers.csv b/libcxx/docs/Status/Cxx23Papers.csv
index eb580ea891f5b..739f0ecab37e7 100644
--- a/libcxx/docs/Status/Cxx23Papers.csv
+++ b/libcxx/docs/Status/Cxx23Papers.csv
@@ -105,7 +105,7 @@
"`P0290R4 <https://wg21.link/P0290R4>`__","``apply()`` for ``synchronized_value<T>``","2023-02 (Issaquah)","","","`#105249 <https://github.com/llvm/llvm-project/issues/105249>`__",""
"`P2770R0 <https://wg21.link/P2770R0>`__","Stashing stashing ``iterators`` for proper flattening","2023-02 (Issaquah)","|Complete|","21","`#105250 <https://github.com/llvm/llvm-project/issues/105250>`__",""
"`P2164R9 <https://wg21.link/P2164R9>`__","``views::enumerate``","2023-02 (Issaquah)","|Complete|","23","`#105251 <https://github.com/llvm/llvm-project/issues/105251>`__",""
-"`P2711R1 <https://wg21.link/P2711R1>`__","Making multi-param constructors of ``views`` ``explicit``","2023-02 (Issaquah)","|Complete|","21","`#105252 <https://github.com/llvm/llvm-project/issues/105252>`__",""
+"`P2711R1 <https://wg21.link/P2711R1>`__","Making multi-param constructors of ``views`` ``explicit``","2023-02 (Issaquah)","|Complete|","21","`#105252 <https://github.com/llvm/llvm-project/issues/105252>`__","Implemented as a DR in C++20 since LLVM 23."
"`P2609R3 <https://wg21.link/P2609R3>`__","Relaxing Ranges Just A Smidge","2023-02 (Issaquah)","|Complete|","20","`#105253 <https://github.com/llvm/llvm-project/issues/105253>`__","Implemented as a DR in C++20. Other implementations will do the same."
"`P2713R1 <https://wg21.link/P2713R1>`__","Escaping improvements in ``std::format``","2023-02 (Issaquah)","|Complete|","19","`#105254 <https://github.com/llvm/llvm-project/issues/105254>`__",""
"`P2675R1 <https://wg21.link/P2675R1>`__","``format``'s width estimation is too approximate and not forward compatible","2023-02 (Issaquah)","|Complete|","17","`#105255 <https://github.com/llvm/llvm-project/issues/105255>`__",""
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 9172166b16b87..fdd0558fbec6f 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -244,12 +244,6 @@ typedef __char32_t char32_t;
# define _LIBCPP_EXPLICIT_SINCE_CXX14 explicit
# endif
-# if _LIBCPP_STD_VER >= 23
-# define _LIBCPP_EXPLICIT_SINCE_CXX23 explicit
-# else
-# define _LIBCPP_EXPLICIT_SINCE_CXX23
-# endif
-
# if _LIBCPP_STD_VER >= 14
# define _LIBCPP_CONSTEXPR_SINCE_CXX14 constexpr
# else
diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h
index feb3705d2df6c..e3754e64d536f 100644
--- a/libcxx/include/__ranges/drop_view.h
+++ b/libcxx/include/__ranges/drop_view.h
@@ -74,8 +74,7 @@ class drop_view : public view_interface<drop_view<_View>> {
requires default_initializable<_View>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23
- drop_view(_View __base, range_
diff erence_t<_View> __count)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit drop_view(_View __base, range_
diff erence_t<_View> __count)
: __count_(__count), __base_(std::move(__base)) {
_LIBCPP_ASSERT_UNCATEGORIZED(__count_ >= 0, "count must be greater than or equal to zero.");
}
diff --git a/libcxx/include/__ranges/drop_while_view.h b/libcxx/include/__ranges/drop_while_view.h
index 1fe4e17f8048b..ed5b91d99425f 100644
--- a/libcxx/include/__ranges/drop_while_view.h
+++ b/libcxx/include/__ranges/drop_while_view.h
@@ -54,7 +54,7 @@ class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS drop_while_view : public view_interfa
requires default_initializable<_View> && default_initializable<_Pred>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 drop_while_view(_View __base, _Pred __pred)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit drop_while_view(_View __base, _Pred __pred)
: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
diff --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h
index 3ad69ea100931..4612dc4a9ba1d 100644
--- a/libcxx/include/__ranges/filter_view.h
+++ b/libcxx/include/__ranges/filter_view.h
@@ -72,7 +72,7 @@ class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS filter_view : public view_interface<f
requires default_initializable<_View> && default_initializable<_Pred>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 filter_view(_View __base, _Pred __pred)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit filter_view(_View __base, _Pred __pred)
: __base_(std::move(__base)), __pred_(in_place, std::move(__pred)) {}
template <class _Vp = _View>
diff --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h
index 29f96545ab34f..38e0ccaf2849e 100644
--- a/libcxx/include/__ranges/iota_view.h
+++ b/libcxx/include/__ranges/iota_view.h
@@ -316,8 +316,8 @@ class iota_view : public view_interface<iota_view<_Start, _BoundSentinel>> {
_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(_Start __value) : __value_(std::move(__value)) {}
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23
- iota_view(type_identity_t<_Start> __value, type_identity_t<_BoundSentinel> __bound_sentinel)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(type_identity_t<_Start> __value,
+ type_identity_t<_BoundSentinel> __bound_sentinel)
: __value_(std::move(__value)), __bound_sentinel_(std::move(__bound_sentinel)) {
// Validate the precondition if possible.
if constexpr (totally_ordered_with<_Start, _BoundSentinel>) {
@@ -326,15 +326,15 @@ class iota_view : public view_interface<iota_view<_Start, _BoundSentinel>> {
}
}
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, __iterator __last)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, __iterator __last)
requires same_as<_Start, _BoundSentinel>
: iota_view(std::move(__first.__value_), std::move(__last.__value_)) {}
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, _BoundSentinel __last)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, _BoundSentinel __last)
requires same_as<_BoundSentinel, unreachable_sentinel_t>
: iota_view(std::move(__first.__value_), std::move(__last)) {}
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, __sentinel __last)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, __sentinel __last)
requires(!same_as<_Start, _BoundSentinel> && !same_as<_BoundSentinel, unreachable_sentinel_t>)
: iota_view(std::move(__first.__value_), std::move(__last.__bound_sentinel_)) {}
diff --git a/libcxx/include/__ranges/lazy_split_view.h b/libcxx/include/__ranges/lazy_split_view.h
index cca9191d26818..938dca24cc4fc 100644
--- a/libcxx/include/__ranges/lazy_split_view.h
+++ b/libcxx/include/__ranges/lazy_split_view.h
@@ -86,13 +86,13 @@ class lazy_split_view : public view_interface<lazy_split_view<_View, _Pattern>>
requires default_initializable<_View> && default_initializable<_Pattern>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 lazy_split_view(_View __base, _Pattern __pattern)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit lazy_split_view(_View __base, _Pattern __pattern)
: __base_(std::move(__base)), __pattern_(std::move(__pattern)) {}
template <input_range _Range>
requires constructible_from<_View, views::all_t<_Range>> &&
constructible_from<_Pattern, single_view<range_value_t<_Range>>>
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 lazy_split_view(_Range&& __r, range_value_t<_Range> __e)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit lazy_split_view(_Range&& __r, range_value_t<_Range> __e)
: __base_(views::all(std::forward<_Range>(__r))), __pattern_(views::single(std::move(__e))) {}
_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
diff --git a/libcxx/include/__ranges/split_view.h b/libcxx/include/__ranges/split_view.h
index 2ec908ba4070e..17a2ceeca6686 100644
--- a/libcxx/include/__ranges/split_view.h
+++ b/libcxx/include/__ranges/split_view.h
@@ -78,14 +78,13 @@ class split_view : public view_interface<split_view<_View, _Pattern>> {
requires default_initializable<_View> && default_initializable<_Pattern>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 split_view(_View __base, _Pattern __pattern)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit split_view(_View __base, _Pattern __pattern)
: __base_(std::move(__base)), __pattern_(std::move((__pattern))) {}
template <forward_range _Range>
requires constructible_from<_View, views::all_t<_Range>> &&
constructible_from<_Pattern, single_view<range_value_t<_Range>>>
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23
- split_view(_Range&& __range, range_value_t<_Range> __elem)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit split_view(_Range&& __range, range_value_t<_Range> __elem)
: __base_(views::all(std::forward<_Range>(__range))), __pattern_(views::single(std::move(__elem))) {}
_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
index 13cb4a285d9df..999f686537f2c 100644
--- a/libcxx/include/__ranges/take_view.h
+++ b/libcxx/include/__ranges/take_view.h
@@ -69,8 +69,7 @@ class take_view : public view_interface<take_view<_View>> {
requires default_initializable<_View>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23
- take_view(_View __base, range_
diff erence_t<_View> __count)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit take_view(_View __base, range_
diff erence_t<_View> __count)
: __base_(std::move(__base)), __count_(__count) {
_LIBCPP_ASSERT_UNCATEGORIZED(__count >= 0, "count has to be greater than or equal to zero");
}
diff --git a/libcxx/include/__ranges/take_while_view.h b/libcxx/include/__ranges/take_while_view.h
index 4977f139fc555..955f681ef76ed 100644
--- a/libcxx/include/__ranges/take_while_view.h
+++ b/libcxx/include/__ranges/take_while_view.h
@@ -58,7 +58,7 @@ class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS take_while_view : public view_interfa
requires default_initializable<_View> && default_initializable<_Pred>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 take_while_view(_View __base, _Pred __pred)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit take_while_view(_View __base, _Pred __pred)
: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
index 98b38dd9b2aa1..5e817a3ca34d4 100644
--- a/libcxx/include/__ranges/transform_view.h
+++ b/libcxx/include/__ranges/transform_view.h
@@ -85,7 +85,7 @@ class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS transform_view : public view_interfac
requires default_initializable<_View> && default_initializable<_Fn>
= default;
- _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 transform_view(_View __base, _Fn __func)
+ _LIBCPP_HIDE_FROM_ABI constexpr explicit transform_view(_View __base, _Fn __func)
: __func_(std::in_place, std::move(__func)), __base_(std::move(__base)) {}
_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop.while/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop.while/ctor.view.pass.cpp
index 326cabd637089..1f38f113545cf 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop.while/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop.while/ctor.view.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr drop_while_view(V base, Pred pred); // explicit since C++23
+// constexpr explicit drop_while_view(V base, Pred pred); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -36,18 +36,9 @@ struct Pred {
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::drop_while_view<View, Pred>, View, Pred>(),
"This constructor must be explicit");
-#else
-
-static_assert( test_convertible<std::ranges::drop_while_view<View, Pred>, View, Pred>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
std::ranges::drop_while_view<View, Pred> dwv{View{{}, MoveOnly{5}}, Pred{}};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
index aeb31ae2fec4b..b036b34c25a72 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr drop_view(V base, range_
diff erence_t<V> count); // explicit since C++23
+// constexpr explicit drop_view(V base, range_
diff erence_t<V> count); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -19,18 +19,9 @@
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::drop_view<View>, View, std::ranges::range_
diff erence_t<View>>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::drop_view<View>, View, std::ranges::range_
diff erence_t<View>>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
std::ranges::drop_view dropView1(MoveOnlyView(), 4);
assert(dropView1.size() == 4);
diff --git a/libcxx/test/std/ranges/range.adaptors/range.filter/ctor.view_pred.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.filter/ctor.view_pred.pass.cpp
index 8eaf6eba35709..dafddfe3d8789 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.filter/ctor.view_pred.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.filter/ctor.view_pred.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr filter_view(View, Pred); // explicit since C++23
+// constexpr explicit filter_view(View, Pred); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -45,18 +45,9 @@ struct TrackingRange : TrackInitialization, std::ranges::view_base {
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::filter_view<Range, Pred>, Range, Pred>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::filter_view<Range, Pred>, Range, Pred>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
int buff[] = {1, 2, 3, 4, 5, 6, 7, 8};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.range.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.range.pass.cpp
index 8eeaa3dae36db..cc06e260c221a 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.range.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.range.pass.cpp
@@ -11,7 +11,7 @@
// template <input_range Range>
// requires constructible_from<View, views::all_t<Range>> &&
// constructible_from<Pattern, single_view<range_value_t<Range>>>
-// constexpr lazy_split_view(Range&& r, range_value_t<Range> e); // explicit since C++23
+// constexpr explicit lazy_split_view(Range&& r, range_value_t<Range> e); // explicit since C++23
#include <ranges>
@@ -88,20 +88,10 @@ static_assert(std::is_copy_constructible_v<StrView>);
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(
!test_convertible<std::ranges::lazy_split_view<StrView, StrView>, StrView, std::ranges::range_value_t<StrView>>(),
"This constructor must be explicit");
-#else
-
-static_assert(
- test_convertible<std::ranges::lazy_split_view<StrView, StrView>, StrView, std::ranges::range_value_t<StrView>>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
using V = std::ranges::lazy_split_view<StrView, StrView>;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.view.pass.cpp
index 46af5498d59a0..efb5965ff386d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/ctor.view.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr lazy_split_view(View base, Pattern pattern); // explicit since C++23
+// constexpr explicit lazy_split_view(View base, Pattern pattern); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -48,18 +48,9 @@ using Pattern = ViewWithCounting;
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::lazy_split_view<View, Pattern>, View, Pattern>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::lazy_split_view<View, Pattern>, View, Pattern>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
// Calling the constructor with `(ForwardView, ForwardView)`.
{
diff --git a/libcxx/test/std/ranges/range.adaptors/range.split/ctor.range.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.split/ctor.range.pass.cpp
index bbe08befdb419..4e2f7c8890e82 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.split/ctor.range.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.split/ctor.range.pass.cpp
@@ -11,7 +11,7 @@
// template <input_range Range>
// requires constructible_from<View, views::all_t<Range>> &&
// constructible_from<Pattern, single_view<range_value_t<Range>>>
-// constexpr split_view(Range&& r, range_value_t<Range> e); // explicit since C++23
+// constexpr explicit split_view(Range&& r, range_value_t<Range> e); // explicit since C++23
#include <algorithm>
#include <cassert>
@@ -73,20 +73,10 @@ static_assert(std::is_copy_constructible_v<StrView>);
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(
!test_convertible<std::ranges::split_view<StrView, StrView>, StrView, std::ranges::range_value_t<StrView>>(),
"This constructor must be explicit");
-# else
-
-static_assert(
- test_convertible<std::ranges::split_view<StrView, StrView>, StrView, std::ranges::range_value_t<StrView>>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
using V = std::ranges::split_view<StrView, StrView>;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.split/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.split/ctor.view.pass.cpp
index 27fc4b84c5206..f68dda1e8ff48 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.split/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.split/ctor.view.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr split_view(View base, Pattern pattern); // explicit since C++23
+// constexpr explicit split_view(View base, Pattern pattern); // explicit since C++23
#include <algorithm>
#include <cassert>
@@ -46,18 +46,9 @@ using Pattern = ViewWithCounting;
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::split_view<View, Pattern>, View, Pattern>(),
"This constructor must be explicit");
-#else
-
-static_assert( test_convertible<std::ranges::split_view<View, Pattern>, View, Pattern>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
std::string_view input = "abc def";
diff --git a/libcxx/test/std/ranges/range.adaptors/range.take.while/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take.while/ctor.view.pass.cpp
index 469b2698c8844..4d68bc9580dfe 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.take.while/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.take.while/ctor.view.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr take_while_view(V base, Pred pred); // explicit since C++23
+// constexpr explicit take_while_view(V base, Pred pred); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -36,18 +36,9 @@ struct Pred {
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::take_while_view<View, Pred>, View, Pred>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::take_while_view<View, Pred>, View, Pred>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
std::ranges::take_while_view<View, Pred> twv{View{{}, MoveOnly{5}}, Pred{}};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.take/ctor.view_count.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take/ctor.view_count.pass.cpp
index f37ffb0825ac1..e1ddf40febb2a 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.take/ctor.view_count.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.take/ctor.view_count.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr take_view(V base, range_
diff erence_t<V> count); // explicit since C++23
+// constexpr explicit take_view(V base, range_
diff erence_t<V> count); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -21,18 +21,9 @@
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::take_view<View>, View, std::ranges::range_
diff erence_t<View>>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::take_view<View>, View, std::ranges::range_
diff erence_t<View>>(),
- "This constructor must be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
int buffer[8] = {1, 2, 3, 4, 5, 6, 7, 8};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/ctor.view_function.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/ctor.view_function.pass.cpp
index 63a43d189256f..afe1faf7f3cdb 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/ctor.view_function.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/ctor.view_function.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr transform_view(View, F); // explicit since C++23
+// constexpr explicit transform_view(View, F); // explicit since C++23
#include <cassert>
#include <ranges>
@@ -32,18 +32,9 @@ struct F {
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::transform_view<Range, F>, Range, F>(),
"This constructor must be explicit");
-#else
-
-static_assert( test_convertible<std::ranges::transform_view<Range, F>, Range, F>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
int buff[] = {1, 2, 3, 4, 5, 6, 7, 8};
diff --git a/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.first.last.pass.cpp b/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.first.last.pass.cpp
index 67b7dc428a14f..25a78d0475f7e 100644
--- a/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.first.last.pass.cpp
+++ b/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.first.last.pass.cpp
@@ -8,7 +8,7 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-// constexpr iota_view(iterator first, see below last); // explicit since C++23
+// constexpr explicit iota_view(iterator first, see below last); // explicit since C++23
#include <ranges>
#include <cassert>
@@ -19,8 +19,6 @@
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
std::ranges::iota_view<SomeInt, SomeInt> view;
static_assert(!test_convertible<std::ranges::iota_view<SomeInt, SomeInt>,
@@ -38,25 +36,6 @@ static_assert(!test_convertible<std::ranges::iota_view<SomeInt, IntComparableWit
decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.end())>(),
"This constructor must be explicit");
-#else
-
-static_assert(test_convertible<std::ranges::iota_view<SomeInt, SomeInt>,
- decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.begin()),
- decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.end())>(),
- "This constructor must not be explicit");
-
-static_assert(test_convertible<std::ranges::iota_view<SomeInt>,
- decltype(std::ranges::iota_view{SomeInt{0}}.begin()),
- decltype(std::unreachable_sentinel)>(),
- "This constructor must not be explicit");
-
-static_assert(test_convertible<std::ranges::iota_view<SomeInt, IntComparableWith<SomeInt>>,
- decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.begin()),
- decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.end())>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
std::ranges::iota_view commonView(SomeInt(0), SomeInt(10));
@@ -91,4 +70,3 @@ int main(int, char**) {
return 0;
}
-
diff --git a/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.value.bound.pass.cpp b/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.value.bound.pass.cpp
index 7528e1ccf3ee0..b6f4295498644 100644
--- a/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.value.bound.pass.cpp
+++ b/libcxx/test/std/ranges/range.factories/range.iota.view/ctor.value.bound.pass.cpp
@@ -14,7 +14,7 @@ TEST_CLANG_DIAGNOSTIC_IGNORED("-Wsign-compare")
TEST_GCC_DIAGNOSTIC_IGNORED("-Wsign-compare")
TEST_MSVC_DIAGNOSTIC_IGNORED(4018 4389) // various "signed/unsigned mismatch"
-// constexpr iota_view(type_identity_t<W> value, type_identity_t<Bound> bound); // explicit since C++23
+// constexpr explicit iota_view(type_identity_t<W> value, type_identity_t<Bound> bound); // explicit since C++23
#include <ranges>
#include <cassert>
@@ -24,8 +24,6 @@ TEST_MSVC_DIAGNOSTIC_IGNORED(4018 4389) // various "signed/unsigned mismatch"
// SFINAE tests.
-#if TEST_STD_VER >= 23
-
static_assert(!test_convertible<std::ranges::iota_view<SomeInt, SomeInt>,
decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.begin()),
decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.end())>(),
@@ -41,25 +39,6 @@ static_assert(!test_convertible<std::ranges::iota_view<SomeInt, IntComparableWit
decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.end())>(),
"This constructor must be explicit");
-#else
-
-static_assert( test_convertible<std::ranges::iota_view<SomeInt, SomeInt>,
- decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.begin()),
- decltype(std::ranges::iota_view<SomeInt, SomeInt>{}.end())>(),
- "This constructor must not be explicit");
-
-static_assert( test_convertible<std::ranges::iota_view<SomeInt>,
- decltype(std::ranges::iota_view<SomeInt>{}.begin()),
- decltype(std::unreachable_sentinel)>(),
- "This constructor must not be explicit");
-
-static_assert( test_convertible<std::ranges::iota_view<SomeInt, IntComparableWith<SomeInt>>,
- decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.begin()),
- decltype(std::ranges::iota_view{SomeInt(0), IntComparableWith(SomeInt(10))}.end())>(),
- "This constructor must not be explicit");
-
-#endif // TEST_STD_VER >= 23
-
constexpr bool test() {
{
std::ranges::iota_view<SomeInt, SomeInt> io(SomeInt(0), SomeInt(10));
More information about the libcxx-commits
mailing list