diff --git a/libcxx/include/__ranges/all.h b/libcxx/include/__ranges/all.h --- a/libcxx/include/__ranges/all.h +++ b/libcxx/include/__ranges/all.h @@ -32,6 +32,7 @@ #if !defined(_LIBCPP_HAS_NO_RANGES) +namespace ranges { namespace views { namespace __all { @@ -76,6 +77,7 @@ using all_t = decltype(views::all(declval<_Range>())); } // namespace views +} // namespace ranges #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/__ranges/counted.h b/libcxx/include/__ranges/counted.h --- a/libcxx/include/__ranges/counted.h +++ b/libcxx/include/__ranges/counted.h @@ -36,6 +36,7 @@ #if !defined(_LIBCPP_HAS_NO_RANGES) +namespace ranges { namespace views { namespace __counted { @@ -89,6 +90,7 @@ } // namespace __cpo } // namespace views +} // namespace ranges #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h --- a/libcxx/include/__ranges/iota_view.h +++ b/libcxx/include/__ranges/iota_view.h @@ -366,7 +366,6 @@ template inline constexpr bool enable_borrowed_range> = true; -} // namespace ranges namespace views { namespace __iota { @@ -395,6 +394,7 @@ inline constexpr auto iota = __iota::__fn{}; } } // namespace views +} // namespace ranges #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/ranges b/libcxx/include/ranges --- a/libcxx/include/ranges +++ b/libcxx/include/ranges @@ -238,6 +238,8 @@ #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_RANGES) +namespace views = ranges::views; + #endif // _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_RANGES) _LIBCPP_END_NAMESPACE_STD diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp @@ -85,9 +85,9 @@ constexpr bool test() { { - ASSERT_SAME_TYPE(decltype(std::views::all(View())), View); - static_assert(noexcept(std::views::all(View()))); - static_assert(!noexcept(std::views::all(View()))); + ASSERT_SAME_TYPE(decltype(std::ranges::views::all(View())), View); + static_assert(noexcept(std::ranges::views::all(View()))); + static_assert(!noexcept(std::ranges::views::all(View()))); auto viewCopy = std::views::all(View(2)); ASSERT_SAME_TYPE(decltype(viewCopy), View); @@ -96,9 +96,9 @@ } { - ASSERT_SAME_TYPE(decltype(std::views::all(std::declval&>())), CopyableView); - static_assert(noexcept(std::views::all(CopyableView()))); - static_assert(!noexcept(std::views::all(CopyableView()))); + ASSERT_SAME_TYPE(decltype(std::ranges::views::all(std::declval&>())), CopyableView); + static_assert(noexcept(std::ranges::views::all(CopyableView()))); + static_assert(!noexcept(std::ranges::views::all(CopyableView()))); CopyableView view(2); auto viewCopy = std::views::all(view); diff --git a/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp @@ -48,7 +48,7 @@ { { contiguous_iterator iter(buffer); - std::span s = std::views::counted(iter, 8); + std::span s = std::ranges::views::counted(iter, 8); assert(s.size() == 8); assert(s.data() == buffer); @@ -56,7 +56,7 @@ } { const contiguous_iterator iter(buffer); - std::span s = std::views::counted(iter, 8); + std::span s = std::ranges::views::counted(iter, 8); assert(s.size() == 8); assert(s.data() == buffer); @@ -64,7 +64,7 @@ } { contiguous_iterator iter(buffer); - std::span s = std::views::counted(iter, 8); + std::span s = std::ranges::views::counted(iter, 8); assert(s.size() == 8); assert(s.data() == buffer); @@ -72,7 +72,7 @@ } { const contiguous_iterator iter(buffer); - std::span s = std::views::counted(iter, 8); + std::span s = std::ranges::views::counted(iter, 8); assert(s.size() == 8); assert(s.data() == buffer); diff --git a/libcxx/test/std/ranges/range.factories/range.iota.view/views_iota.pass.cpp b/libcxx/test/std/ranges/range.factories/range.iota.view/views_iota.pass.cpp --- a/libcxx/test/std/ranges/range.factories/range.iota.view/views_iota.pass.cpp +++ b/libcxx/test/std/ranges/range.factories/range.iota.view/views_iota.pass.cpp @@ -24,15 +24,15 @@ // Test that this generally does the right thing. // Test with only one argument. { - assert(*std::views::iota(T(0)).begin() == T(0)); + assert(*std::ranges::views::iota(T(0)).begin() == T(0)); } { - const auto io = std::views::iota(T(10)); + const auto io = std::ranges::views::iota(T(10)); assert(*io.begin() == T(10)); } // Test with two arguments. { - assert(*std::views::iota(T(0), u).begin() == T(0)); + assert(*std::ranges::views::iota(T(0), u).begin() == T(0)); } { const auto io = std::views::iota(T(10), u);