[libcxx-commits] [libcxx] 60059de - [libc++][NFC] Avoid empty namespace in internal headers of `<ranges>` (#226034)
via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Sep 25 22:20:02 PDT 2026
Author: A. Jiang
Date: 2026-09-26T13:19:53+08:00
New Revision: 60059de6eb6d647857ac55b48d465580aa3ecdc5
URL: https://github.com/llvm/llvm-project/commit/60059de6eb6d647857ac55b48d465580aa3ecdc5
DIFF: https://github.com/llvm/llvm-project/commit/60059de6eb6d647857ac55b48d465580aa3ecdc5.diff
LOG: [libc++][NFC] Avoid empty namespace in internal headers of `<ranges>` (#226034)
...in pre-C++20/23 modes. This follows up
0c94a978df783bd67535350eac84088fc482716a and fixes more complaints from
clang-tidy checks in CI.
Added:
Modified:
libcxx/include/__ranges/adjacent_transform_view.h
libcxx/include/__ranges/adjacent_view.h
libcxx/include/__ranges/chunk_by_view.h
libcxx/include/__ranges/common_view.h
libcxx/include/__ranges/concat_view.h
libcxx/include/__ranges/counted.h
libcxx/include/__ranges/drop_view.h
libcxx/include/__ranges/drop_while_view.h
libcxx/include/__ranges/elements_view.h
libcxx/include/__ranges/empty_view.h
libcxx/include/__ranges/enumerate_view.h
libcxx/include/__ranges/filter_view.h
libcxx/include/__ranges/iota_view.h
libcxx/include/__ranges/join_view.h
libcxx/include/__ranges/join_with_view.h
libcxx/include/__ranges/lazy_split_view.h
libcxx/include/__ranges/movable_box.h
libcxx/include/__ranges/non_propagating_cache.h
libcxx/include/__ranges/rbegin.h
libcxx/include/__ranges/rend.h
libcxx/include/__ranges/reverse_view.h
libcxx/include/__ranges/single_view.h
libcxx/include/__ranges/split_view.h
libcxx/include/__ranges/stride_view.h
libcxx/include/__ranges/take_view.h
libcxx/include/__ranges/take_while_view.h
libcxx/include/__ranges/to.h
libcxx/include/__ranges/transform_view.h
libcxx/include/__ranges/views.h
libcxx/include/__ranges/zip_transform_view.h
libcxx/include/__ranges/zip_view.h
Removed:
################################################################################
diff --git a/libcxx/include/__ranges/adjacent_transform_view.h b/libcxx/include/__ranges/adjacent_transform_view.h
index e0c20b7a95513c..df895b4a668679 100644
--- a/libcxx/include/__ranges/adjacent_transform_view.h
+++ b/libcxx/include/__ranges/adjacent_transform_view.h
@@ -61,10 +61,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Fn, size_t _Np>
@@ -398,10 +398,10 @@ inline constexpr auto pairwise_transform = adjacent_transform<2>;
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ADJACENT_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__ranges/adjacent_view.h b/libcxx/include/__ranges/adjacent_view.h
index ac1366adb4efc2..6ccdd4fb4efeb4 100644
--- a/libcxx/include/__ranges/adjacent_view.h
+++ b/libcxx/include/__ranges/adjacent_view.h
@@ -54,10 +54,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <forward_range _View, size_t _Np>
@@ -411,10 +411,10 @@ inline constexpr auto pairwise = adjacent<2>;
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ADJACENT_VIEW_H
diff --git a/libcxx/include/__ranges/chunk_by_view.h b/libcxx/include/__ranges/chunk_by_view.h
index 07824d11e79be6..f5254104818932 100644
--- a/libcxx/include/__ranges/chunk_by_view.h
+++ b/libcxx/include/__ranges/chunk_by_view.h
@@ -46,10 +46,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <forward_range _View, indirect_binary_predicate<iterator_t<_View>, iterator_t<_View>> _Pred>
@@ -226,10 +226,10 @@ inline constexpr auto chunk_by = __chunk_by::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_CHUNK_BY_VIEW_H
diff --git a/libcxx/include/__ranges/common_view.h b/libcxx/include/__ranges/common_view.h
index eec1045c8a758b..f8276e2295dd86 100644
--- a/libcxx/include/__ranges/common_view.h
+++ b/libcxx/include/__ranges/common_view.h
@@ -32,10 +32,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View>
@@ -133,10 +133,10 @@ inline constexpr auto common = __common::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_COMMON_VIEW_H
diff --git a/libcxx/include/__ranges/concat_view.h b/libcxx/include/__ranges/concat_view.h
index 41fd8cd216c3fa..7a41e4184a79e8 100644
--- a/libcxx/include/__ranges/concat_view.h
+++ b/libcxx/include/__ranges/concat_view.h
@@ -53,10 +53,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 26
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
# ifdef __cpp_pack_indexing
@@ -641,10 +641,10 @@ inline constexpr auto concat = __concat::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 26
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 26
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_CONCAT_VIEW_H
diff --git a/libcxx/include/__ranges/counted.h b/libcxx/include/__ranges/counted.h
index 65bf1a371ec780..3b8dd5f05077eb 100644
--- a/libcxx/include/__ranges/counted.h
+++ b/libcxx/include/__ranges/counted.h
@@ -32,10 +32,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges::views {
namespace __counted {
@@ -80,10 +80,10 @@ inline constexpr auto counted = __counted::__fn{};
} // namespace ranges::views
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_COUNTED_H
diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h
index e3754e64d536f1..c8b1f45b822d3b 100644
--- a/libcxx/include/__ranges/drop_view.h
+++ b/libcxx/include/__ranges/drop_view.h
@@ -51,10 +51,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View>
class drop_view : public view_interface<drop_view<_View>> {
@@ -319,10 +319,10 @@ inline constexpr auto drop = __drop::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_DROP_VIEW_H
diff --git a/libcxx/include/__ranges/drop_while_view.h b/libcxx/include/__ranges/drop_while_view.h
index caa24643b477f7..9d71322e2b96df 100644
--- a/libcxx/include/__ranges/drop_while_view.h
+++ b/libcxx/include/__ranges/drop_while_view.h
@@ -40,10 +40,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View, class _Pred>
@@ -127,10 +127,10 @@ inline constexpr auto drop_while = __drop_while::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_DROP_WHILE_VIEW_H
diff --git a/libcxx/include/__ranges/elements_view.h b/libcxx/include/__ranges/elements_view.h
index 706744ae652e15..3b7c2f34426978 100644
--- a/libcxx/include/__ranges/elements_view.h
+++ b/libcxx/include/__ranges/elements_view.h
@@ -46,10 +46,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Tp, size_t _Np>
@@ -414,10 +414,10 @@ inline constexpr auto values = elements<1>;
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ELEMENTS_VIEW_H
diff --git a/libcxx/include/__ranges/empty_view.h b/libcxx/include/__ranges/empty_view.h
index 54d62b3c77a783..960694dcdc2d19 100644
--- a/libcxx/include/__ranges/empty_view.h
+++ b/libcxx/include/__ranges/empty_view.h
@@ -20,10 +20,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Tp>
requires is_object_v<_Tp>
@@ -47,8 +47,8 @@ inline constexpr empty_view<_Tp> empty{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
#endif // _LIBCPP___RANGES_EMPTY_VIEW_H
diff --git a/libcxx/include/__ranges/enumerate_view.h b/libcxx/include/__ranges/enumerate_view.h
index bb7696897af004..4dc8ece5c3b58d 100644
--- a/libcxx/include/__ranges/enumerate_view.h
+++ b/libcxx/include/__ranges/enumerate_view.h
@@ -36,10 +36,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
// [concept.object]
@@ -341,10 +341,10 @@ inline constexpr auto enumerate = __enumerate::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ENUMERATE_VIEW_H
diff --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h
index 3004e830173f1e..3be45762b11d75 100644
--- a/libcxx/include/__ranges/filter_view.h
+++ b/libcxx/include/__ranges/filter_view.h
@@ -47,10 +47,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
requires view<_View> && is_object_v<_Pred>
@@ -257,10 +257,10 @@ inline constexpr auto filter = __filter::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_FILTER_VIEW_H
diff --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h
index 9d87138d29e23b..f8373f875699e7 100644
--- a/libcxx/include/__ranges/iota_view.h
+++ b/libcxx/include/__ranges/iota_view.h
@@ -44,10 +44,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Int>
struct __get_wider_signed {
@@ -417,10 +417,10 @@ inline constexpr auto indices = [] [[nodiscard]] (__integer_like auto __size) st
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_IOTA_VIEW_H
diff --git a/libcxx/include/__ranges/join_view.h b/libcxx/include/__ranges/join_view.h
index def920648e67fe..94e14abe6acb69 100644
--- a/libcxx/include/__ranges/join_view.h
+++ b/libcxx/include/__ranges/join_view.h
@@ -49,10 +49,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class>
struct __join_view_iterator_category {};
@@ -427,10 +427,10 @@ struct __segmented_iterator_traits<_JoinViewIterator> {
}
};
-#endif // #if _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // #if _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_JOIN_VIEW_H
diff --git a/libcxx/include/__ranges/join_with_view.h b/libcxx/include/__ranges/join_with_view.h
index 3ce9011762e261..5a0f1d8847f26e 100644
--- a/libcxx/include/__ranges/join_with_view.h
+++ b/libcxx/include/__ranges/join_with_view.h
@@ -49,10 +49,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Range>
concept __bidirectional_common = bidirectional_range<_Range> && common_range<_Range>;
@@ -450,10 +450,10 @@ inline constexpr auto join_with = __join_with_view::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_JOIN_WITH_VIEW_H
diff --git a/libcxx/include/__ranges/lazy_split_view.h b/libcxx/include/__ranges/lazy_split_view.h
index 735cc0cfd63b7c..468f9714318c12 100644
--- a/libcxx/include/__ranges/lazy_split_view.h
+++ b/libcxx/include/__ranges/lazy_split_view.h
@@ -50,10 +50,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <auto>
@@ -442,10 +442,10 @@ inline constexpr auto lazy_split = __lazy_split_view::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
diff --git a/libcxx/include/__ranges/movable_box.h b/libcxx/include/__ranges/movable_box.h
index 117111698c04a4..98d97e6244ff7c 100644
--- a/libcxx/include/__ranges/movable_box.h
+++ b/libcxx/include/__ranges/movable_box.h
@@ -31,10 +31,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
// __movable_box allows turning a type that is move-constructible (but maybe not move-assignable) into
// a type that is both move-constructible and move-assignable. It does that by introducing an empty state
// and basically doing destroy-then-copy-construct in the assignment operator. The empty state is necessary
@@ -242,10 +242,10 @@ class __movable_box<_Tp> {
};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_MOVABLE_BOX_H
diff --git a/libcxx/include/__ranges/non_propagating_cache.h b/libcxx/include/__ranges/non_propagating_cache.h
index 9d71827c94caac..39328830d94b53 100644
--- a/libcxx/include/__ranges/non_propagating_cache.h
+++ b/libcxx/include/__ranges/non_propagating_cache.h
@@ -23,10 +23,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
// __non_propagating_cache is a helper type that allows storing an optional value in it,
// but which does not copy the source's value when it is copy constructed/assigned to,
@@ -98,8 +98,8 @@ class __non_propagating_cache {
struct __empty_cache {};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
#endif // _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
diff --git a/libcxx/include/__ranges/rbegin.h b/libcxx/include/__ranges/rbegin.h
index 12e739e1a2b852..2b867bea963144 100644
--- a/libcxx/include/__ranges/rbegin.h
+++ b/libcxx/include/__ranges/rbegin.h
@@ -27,10 +27,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
// [ranges.access.rbegin]
namespace ranges {
@@ -113,8 +113,8 @@ inline constexpr auto crbegin = __crbegin::__fn{};
} // namespace __cpo
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
#endif // _LIBCPP___RANGES_RBEGIN_H
diff --git a/libcxx/include/__ranges/rend.h b/libcxx/include/__ranges/rend.h
index 02b4c5999a7ebb..7fa8e84040c2d9 100644
--- a/libcxx/include/__ranges/rend.h
+++ b/libcxx/include/__ranges/rend.h
@@ -28,10 +28,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
// [range.access.rend]
namespace ranges {
@@ -116,8 +116,8 @@ inline constexpr auto crend = __crend::__fn{};
} // namespace __cpo
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
#endif // _LIBCPP___RANGES_REND_H
diff --git a/libcxx/include/__ranges/reverse_view.h b/libcxx/include/__ranges/reverse_view.h
index b016cc231f2b58..2c6355c1b146d2 100644
--- a/libcxx/include/__ranges/reverse_view.h
+++ b/libcxx/include/__ranges/reverse_view.h
@@ -36,10 +36,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View>
requires bidirectional_range<_View>
@@ -195,10 +195,10 @@ inline constexpr auto reverse = __reverse::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_REVERSE_VIEW_H
diff --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h
index b86a8d6790b012..4fa73b76d49f24 100644
--- a/libcxx/include/__ranges/single_view.h
+++ b/libcxx/include/__ranges/single_view.h
@@ -30,10 +30,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
# if _LIBCPP_STD_VER >= 23
template <move_constructible _Tp>
@@ -103,10 +103,10 @@ inline constexpr auto single = __single_view::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_SINGLE_VIEW_H
diff --git a/libcxx/include/__ranges/split_view.h b/libcxx/include/__ranges/split_view.h
index 7295e33a282f00..9443b9a33c59b0 100644
--- a/libcxx/include/__ranges/split_view.h
+++ b/libcxx/include/__ranges/split_view.h
@@ -39,10 +39,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <forward_range _View, forward_range _Pattern>
@@ -226,10 +226,10 @@ inline constexpr auto split = __split_view::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_SPLIT_VIEW_H
diff --git a/libcxx/include/__ranges/stride_view.h b/libcxx/include/__ranges/stride_view.h
index 780bb25743c153..78bb0cf0016519 100644
--- a/libcxx/include/__ranges/stride_view.h
+++ b/libcxx/include/__ranges/stride_view.h
@@ -40,10 +40,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Value>
@@ -401,10 +401,10 @@ inline constexpr auto stride = __stride_view::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_STRIDE_VIEW_H
diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
index ee62d49f71d8b6..23c07fc9932c43 100644
--- a/libcxx/include/__ranges/take_view.h
+++ b/libcxx/include/__ranges/take_view.h
@@ -50,10 +50,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View>
@@ -360,10 +360,10 @@ inline constexpr auto take = __take::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_TAKE_VIEW_H
diff --git a/libcxx/include/__ranges/take_while_view.h b/libcxx/include/__ranges/take_while_view.h
index e77b79665d1f66..51734d66cff051 100644
--- a/libcxx/include/__ranges/take_while_view.h
+++ b/libcxx/include/__ranges/take_while_view.h
@@ -38,10 +38,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <view _View, class _Pred>
@@ -163,10 +163,10 @@ inline constexpr auto take_while = __take_while::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
diff --git a/libcxx/include/__ranges/to.h b/libcxx/include/__ranges/to.h
index 3a2bc42969f7b2..1b1f754df6148d 100644
--- a/libcxx/include/__ranges/to.h
+++ b/libcxx/include/__ranges/to.h
@@ -38,10 +38,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Container>
@@ -241,8 +241,8 @@ template <template <class...> class _Container, class... _Args>
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
#endif // _LIBCPP___RANGES_TO_H
diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
index 807f1cf19a0acf..40881667e1d77c 100644
--- a/libcxx/include/__ranges/transform_view.h
+++ b/libcxx/include/__ranges/transform_view.h
@@ -51,10 +51,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class _Fn, class _View>
@@ -425,10 +425,10 @@ inline constexpr auto transform = __transform::__fn{};
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__ranges/views.h b/libcxx/include/__ranges/views.h
index e416b3f76d3f7a..0635ea588c4d01 100644
--- a/libcxx/include/__ranges/views.h
+++ b/libcxx/include/__ranges/views.h
@@ -16,10 +16,10 @@
# pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
namespace views { // NOLINT(libcpp-avoid-empty-namespaces) // This is needed to declare the alias below.
@@ -29,8 +29,8 @@ namespace views { // NOLINT(libcpp-avoid-empty-namespaces) // This is needed to
namespace views = ranges::views;
-#endif // _LIBCPP_STD_VER >= 20
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
+
#endif // _LIBCPP___RANGES_VIEWS
diff --git a/libcxx/include/__ranges/zip_transform_view.h b/libcxx/include/__ranges/zip_transform_view.h
index ffa3e9f9c6dd29..22946df781c81b 100644
--- a/libcxx/include/__ranges/zip_transform_view.h
+++ b/libcxx/include/__ranges/zip_transform_view.h
@@ -47,10 +47,11 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <move_constructible _Fn, input_range... _Views>
@@ -349,10 +350,10 @@ inline constexpr auto zip_transform = __zip_transform::__fn{};
} // namespace views
} // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ZIP_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__ranges/zip_view.h b/libcxx/include/__ranges/zip_view.h
index aa13bed5f428d8..096798eb838093 100644
--- a/libcxx/include/__ranges/zip_view.h
+++ b/libcxx/include/__ranges/zip_view.h
@@ -47,10 +47,10 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
-
#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
+
namespace ranges {
template <class... _Ranges>
@@ -493,10 +493,10 @@ struct __product_iterator_traits<_Iterator> {
}
};
-#endif // _LIBCPP_STD_VER >= 23
-
_LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
+
_LIBCPP_POP_MACROS
#endif // _LIBCPP___RANGES_ZIP_VIEW_H
More information about the libcxx-commits
mailing list