[libcxx-commits] [libcxx] 1e4ba7e - [libcxx][nfc] Global `constexpr friend` -> `friend constexpr`.
via libcxx-commits
libcxx-commits at lists.llvm.org
Fri Jul 23 09:09:29 PDT 2021
Author: zoecarver
Date: 2021-07-23T09:08:50-07:00
New Revision: 1e4ba7eba607623cd12cddd459258ffcad15ee1b
URL: https://github.com/llvm/llvm-project/commit/1e4ba7eba607623cd12cddd459258ffcad15ee1b
DIFF: https://github.com/llvm/llvm-project/commit/1e4ba7eba607623cd12cddd459258ffcad15ee1b.diff
LOG: [libcxx][nfc] Global `constexpr friend` -> `friend constexpr`.
Added:
Modified:
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_sentinel.pass.cpp
libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.common.view/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.common.view/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.common.view/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.common.view/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/types.h
libcxx/test/std/ranges/range.adaptors/range.transform/types.h
libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
libcxx/test/support/test_iterators.h
libcxx/test/support/type_classification/swappable.h
Removed:
################################################################################
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp
index 0a2d03287d0a5..b8e43728bbfd0 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count_sentinel.pass.cpp
@@ -31,12 +31,12 @@ class distance_apriori_sentinel {
return false;
}
- constexpr friend std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
+ friend constexpr std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
distance_apriori_sentinel const y) {
return -y.count_;
}
- constexpr friend std::ptr
diff _t operator-(distance_apriori_sentinel const x,
+ friend constexpr std::ptr
diff _t operator-(distance_apriori_sentinel const x,
std::input_or_output_iterator auto const&) {
return x.count_;
}
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp
index b70ae9975888c..3cc7c67612964 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_sentinel.pass.cpp
@@ -31,12 +31,12 @@ class distance_apriori_sentinel {
return false;
}
- constexpr friend std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
+ friend constexpr std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
distance_apriori_sentinel const y) {
return -y.count_;
}
- constexpr friend std::ptr
diff _t operator-(distance_apriori_sentinel const x,
+ friend constexpr std::ptr
diff _t operator-(distance_apriori_sentinel const x,
std::input_or_output_iterator auto const&) {
return x.count_;
}
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_sentinel.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_sentinel.pass.cpp
index ef28113dbf7ef..b6873c83723ce 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_sentinel.pass.cpp
@@ -32,12 +32,12 @@ class distance_apriori_sentinel {
return false;
}
- constexpr friend std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
+ friend constexpr std::ptr
diff _t operator-(std::input_or_output_iterator auto const&,
distance_apriori_sentinel const y) {
return -y.count_;
}
- constexpr friend std::ptr
diff _t operator-(distance_apriori_sentinel const x,
+ friend constexpr std::ptr
diff _t operator-(distance_apriori_sentinel const x,
std::input_or_output_iterator auto const&) {
return x.count_;
}
diff --git a/libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp b/libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp
index 042bc4d5e52ec..567412a69268d 100644
--- a/libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp
+++ b/libcxx/test/std/ranges/range.access/range.prim/data.pass.cpp
@@ -123,7 +123,7 @@ static_assert(!std::is_invocable_v<RangeDataT, BeginMemberRandomAccess const&>);
struct BeginFriendContiguousIterator {
int buff[8];
- constexpr friend ContiguousIter begin(const BeginFriendContiguousIterator &iter) {
+ friend constexpr ContiguousIter begin(const BeginFriendContiguousIterator &iter) {
return ContiguousIter(iter.buff);
}
};
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
index 46bd928572036..c4adfb318795d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/all.pass.cpp
@@ -27,10 +27,10 @@ struct View : std::ranges::view_base {
constexpr explicit View(int start) : start_(start) {}
View(View&&) noexcept(IsNoexcept) = default;
View& operator=(View&&) noexcept(IsNoexcept) = default;
- constexpr friend int* begin(View& view) { return globalBuff + view.start_; }
- constexpr friend int* begin(View const& view) { return globalBuff + view.start_; }
- constexpr friend int* end(View&) { return globalBuff + 8; }
- constexpr friend int* end(View const&) { return globalBuff + 8; }
+ friend constexpr int* begin(View& view) { return globalBuff + view.start_; }
+ friend constexpr int* begin(View const& view) { return globalBuff + view.start_; }
+ friend constexpr int* end(View&) { return globalBuff + 8; }
+ friend constexpr int* end(View const&) { return globalBuff + 8; }
};
static_assert(std::ranges::view<View<true>>);
static_assert(std::ranges::view<View<false>>);
@@ -42,10 +42,10 @@ struct CopyableView : std::ranges::view_base {
CopyableView(CopyableView const&) noexcept(IsNoexcept) = default;
CopyableView& operator=(CopyableView const&) noexcept(IsNoexcept) = default;
constexpr explicit CopyableView(int start) noexcept : start_(start) {}
- constexpr friend int* begin(CopyableView& view) { return globalBuff + view.start_; }
- constexpr friend int* begin(CopyableView const& view) { return globalBuff + view.start_; }
- constexpr friend int* end(CopyableView&) { return globalBuff + 8; }
- constexpr friend int* end(CopyableView const&) { return globalBuff + 8; }
+ friend constexpr int* begin(CopyableView& view) { return globalBuff + view.start_; }
+ friend constexpr int* begin(CopyableView const& view) { return globalBuff + view.start_; }
+ friend constexpr int* end(CopyableView&) { return globalBuff + 8; }
+ friend constexpr int* end(CopyableView const&) { return globalBuff + 8; }
};
static_assert(std::ranges::view<CopyableView<true>>);
static_assert(std::ranges::view<CopyableView<false>>);
@@ -53,19 +53,19 @@ static_assert(std::ranges::view<CopyableView<false>>);
struct Range {
int start_;
constexpr explicit Range(int start) noexcept : start_(start) {}
- constexpr friend int* begin(Range const& range) { return globalBuff + range.start_; }
- constexpr friend int* begin(Range& range) { return globalBuff + range.start_; }
- constexpr friend int* end(Range const&) { return globalBuff + 8; }
- constexpr friend int* end(Range&) { return globalBuff + 8; }
+ friend constexpr int* begin(Range const& range) { return globalBuff + range.start_; }
+ friend constexpr int* begin(Range& range) { return globalBuff + range.start_; }
+ friend constexpr int* end(Range const&) { return globalBuff + 8; }
+ friend constexpr int* end(Range&) { return globalBuff + 8; }
};
struct BorrowableRange {
int start_;
constexpr explicit BorrowableRange(int start) noexcept : start_(start) {}
- constexpr friend int* begin(BorrowableRange const& range) { return globalBuff + range.start_; }
- constexpr friend int* begin(BorrowableRange& range) { return globalBuff + range.start_; }
- constexpr friend int* end(BorrowableRange const&) { return globalBuff + 8; }
- constexpr friend int* end(BorrowableRange&) { return globalBuff + 8; }
+ friend constexpr int* begin(BorrowableRange const& range) { return globalBuff + range.start_; }
+ friend constexpr int* begin(BorrowableRange& range) { return globalBuff + range.start_; }
+ friend constexpr int* end(BorrowableRange const&) { return globalBuff + 8; }
+ friend constexpr int* end(BorrowableRange&) { return globalBuff + 8; }
};
template<>
inline constexpr bool std::ranges::enable_borrowed_range<BorrowableRange> = true;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.common.view/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.common.view/base.pass.cpp
index bf744c01fafc9..0f3df9e72e9c6 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.common.view/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.common.view/base.pass.cpp
@@ -25,12 +25,12 @@ struct ContiguousView : std::ranges::view_base {
constexpr ContiguousView(int* ptr) : ptr_(ptr) {}
constexpr ContiguousView(ContiguousView&&) = default;
constexpr ContiguousView& operator=(ContiguousView&&) = default;
- constexpr friend int* begin(ContiguousView& view) { return view.ptr_; }
- constexpr friend int* begin(ContiguousView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(ContiguousView& view) {
+ friend constexpr int* begin(ContiguousView& view) { return view.ptr_; }
+ friend constexpr int* begin(ContiguousView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(ContiguousView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
@@ -38,12 +38,12 @@ struct ContiguousView : std::ranges::view_base {
struct CopyableView : std::ranges::view_base {
int *ptr_;
constexpr CopyableView(int* ptr) : ptr_(ptr) {}
- constexpr friend int* begin(CopyableView& view) { return view.ptr_; }
- constexpr friend int* begin(CopyableView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(CopyableView& view) {
+ friend constexpr int* begin(CopyableView& view) { return view.ptr_; }
+ friend constexpr int* begin(CopyableView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(CopyableView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(CopyableView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(CopyableView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.common.view/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.common.view/begin.pass.cpp
index 94e9ddfec174d..9edd8eb9ff52b 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.common.view/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.common.view/begin.pass.cpp
@@ -25,12 +25,12 @@ struct ContiguousView : std::ranges::view_base {
constexpr ContiguousView(int* ptr) : ptr_(ptr) {}
constexpr ContiguousView(ContiguousView&&) = default;
constexpr ContiguousView& operator=(ContiguousView&&) = default;
- constexpr friend int* begin(ContiguousView& view) { return view.ptr_; }
- constexpr friend int* begin(ContiguousView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(ContiguousView& view) {
+ friend constexpr int* begin(ContiguousView& view) { return view.ptr_; }
+ friend constexpr int* begin(ContiguousView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(ContiguousView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
@@ -38,12 +38,12 @@ struct ContiguousView : std::ranges::view_base {
struct CopyableView : std::ranges::view_base {
int *ptr_;
constexpr CopyableView(int* ptr) : ptr_(ptr) {}
- constexpr friend int* begin(CopyableView& view) { return view.ptr_; }
- constexpr friend int* begin(CopyableView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(CopyableView& view) {
+ friend constexpr int* begin(CopyableView& view) { return view.ptr_; }
+ friend constexpr int* begin(CopyableView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(CopyableView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(CopyableView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(CopyableView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
@@ -59,12 +59,12 @@ using ForwardIter = forward_iterator<int*>;
struct SizedForwardView : std::ranges::view_base {
int *ptr_;
constexpr SizedForwardView(int* ptr) : ptr_(ptr) {}
- constexpr friend ForwardIter begin(SizedForwardView& view) { return ForwardIter(view.ptr_); }
- constexpr friend ForwardIter begin(SizedForwardView const& view) { return ForwardIter(view.ptr_); }
- constexpr friend sentinel_wrapper<ForwardIter> end(SizedForwardView& view) {
+ friend constexpr ForwardIter begin(SizedForwardView& view) { return ForwardIter(view.ptr_); }
+ friend constexpr ForwardIter begin(SizedForwardView const& view) { return ForwardIter(view.ptr_); }
+ friend constexpr sentinel_wrapper<ForwardIter> end(SizedForwardView& view) {
return sentinel_wrapper<ForwardIter>{ForwardIter(view.ptr_ + 8)};
}
- constexpr friend sentinel_wrapper<ForwardIter> end(SizedForwardView const& view) {
+ friend constexpr sentinel_wrapper<ForwardIter> end(SizedForwardView const& view) {
return sentinel_wrapper<ForwardIter>{ForwardIter(view.ptr_ + 8)};
}
};
@@ -80,12 +80,12 @@ using RandomAccessIter = random_access_iterator<int*>;
struct SizedRandomAccessView : std::ranges::view_base {
int *ptr_;
constexpr SizedRandomAccessView(int* ptr) : ptr_(ptr) {}
- constexpr friend RandomAccessIter begin(SizedRandomAccessView& view) { return RandomAccessIter(view.ptr_); }
- constexpr friend RandomAccessIter begin(SizedRandomAccessView const& view) { return RandomAccessIter(view.ptr_); }
- constexpr friend sentinel_wrapper<RandomAccessIter> end(SizedRandomAccessView& view) {
+ friend constexpr RandomAccessIter begin(SizedRandomAccessView& view) { return RandomAccessIter(view.ptr_); }
+ friend constexpr RandomAccessIter begin(SizedRandomAccessView const& view) { return RandomAccessIter(view.ptr_); }
+ friend constexpr sentinel_wrapper<RandomAccessIter> end(SizedRandomAccessView& view) {
return sentinel_wrapper<RandomAccessIter>{RandomAccessIter(view.ptr_ + 8)};
}
- constexpr friend sentinel_wrapper<RandomAccessIter> end(SizedRandomAccessView const& view) {
+ friend constexpr sentinel_wrapper<RandomAccessIter> end(SizedRandomAccessView const& view) {
return sentinel_wrapper<RandomAccessIter>{RandomAccessIter(view.ptr_ + 8)};
}
};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.common.view/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.common.view/ctor.default.pass.cpp
index 2ba59cbe358c4..2b76a271ffc90 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.common.view/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.common.view/ctor.default.pass.cpp
@@ -25,12 +25,12 @@ struct ContiguousView : std::ranges::view_base {
constexpr ContiguousView(int* ptr) : ptr_(ptr) {}
constexpr ContiguousView(ContiguousView&&) = default;
constexpr ContiguousView& operator=(ContiguousView&&) = default;
- constexpr friend int* begin(ContiguousView& view) { return view.ptr_; }
- constexpr friend int* begin(ContiguousView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(ContiguousView& view) {
+ friend constexpr int* begin(ContiguousView& view) { return view.ptr_; }
+ friend constexpr int* begin(ContiguousView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(ContiguousView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(ContiguousView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
@@ -38,12 +38,12 @@ struct ContiguousView : std::ranges::view_base {
struct CopyableView : std::ranges::view_base {
int *ptr_;
constexpr CopyableView(int* ptr = globalBuffer) : ptr_(ptr) {}
- constexpr friend int* begin(CopyableView& view) { return view.ptr_; }
- constexpr friend int* begin(CopyableView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(CopyableView& view) {
+ friend constexpr int* begin(CopyableView& view) { return view.ptr_; }
+ friend constexpr int* begin(CopyableView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(CopyableView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 4};
}
- constexpr friend sentinel_wrapper<int*> end(CopyableView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(CopyableView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 4};
}
};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.common.view/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.common.view/size.pass.cpp
index db58734779214..464b9ea147592 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.common.view/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.common.view/size.pass.cpp
@@ -22,12 +22,12 @@
struct CopyableView : std::ranges::view_base {
int *ptr_;
constexpr CopyableView(int* ptr) : ptr_(ptr) {}
- constexpr friend int* begin(CopyableView& view) { return view.ptr_; }
- constexpr friend int* begin(CopyableView const& view) { return view.ptr_; }
- constexpr friend sentinel_wrapper<int*> end(CopyableView& view) {
+ friend constexpr int* begin(CopyableView& view) { return view.ptr_; }
+ friend constexpr int* begin(CopyableView const& view) { return view.ptr_; }
+ friend constexpr sentinel_wrapper<int*> end(CopyableView& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
- constexpr friend sentinel_wrapper<int*> end(CopyableView const& view) {
+ friend constexpr sentinel_wrapper<int*> end(CopyableView const& view) {
return sentinel_wrapper<int*>{view.ptr_ + 8};
}
};
@@ -36,12 +36,12 @@ using ForwardIter = forward_iterator<int*>;
struct SizedForwardView : std::ranges::view_base {
int *ptr_;
constexpr SizedForwardView(int* ptr) : ptr_(ptr) {}
- constexpr friend ForwardIter begin(SizedForwardView& view) { return ForwardIter(view.ptr_); }
- constexpr friend ForwardIter begin(SizedForwardView const& view) { return ForwardIter(view.ptr_); }
- constexpr friend sentinel_wrapper<ForwardIter> end(SizedForwardView& view) {
+ friend constexpr ForwardIter begin(SizedForwardView& view) { return ForwardIter(view.ptr_); }
+ friend constexpr ForwardIter begin(SizedForwardView const& view) { return ForwardIter(view.ptr_); }
+ friend constexpr sentinel_wrapper<ForwardIter> end(SizedForwardView& view) {
return sentinel_wrapper<ForwardIter>{ForwardIter(view.ptr_ + 8)};
}
- constexpr friend sentinel_wrapper<ForwardIter> end(SizedForwardView const& view) {
+ friend constexpr sentinel_wrapper<ForwardIter> end(SizedForwardView const& view) {
return sentinel_wrapper<ForwardIter>{ForwardIter(view.ptr_ + 8)};
}
};
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/types.h b/libcxx/test/std/ranges/range.adaptors/range.drop/types.h
index 692fdfece2771..e861f6f029da6 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/types.h
@@ -19,10 +19,10 @@ struct ContiguousView : std::ranges::view_base {
constexpr ContiguousView(int start = 0) : start_(start) {}
constexpr ContiguousView(ContiguousView&&) = default;
constexpr ContiguousView& operator=(ContiguousView&&) = default;
- constexpr friend int* begin(ContiguousView& view) { return globalBuff + view.start_; }
- constexpr friend int* begin(ContiguousView const& view) { return globalBuff + view.start_; }
- constexpr friend int* end(ContiguousView&) { return globalBuff + 8; }
- constexpr friend int* end(ContiguousView const&) { return globalBuff + 8; }
+ friend constexpr int* begin(ContiguousView& view) { return globalBuff + view.start_; }
+ friend constexpr int* begin(ContiguousView const& view) { return globalBuff + view.start_; }
+ friend constexpr int* end(ContiguousView&) { return globalBuff + 8; }
+ friend constexpr int* end(ContiguousView const&) { return globalBuff + 8; }
};
struct CopyableView : std::ranges::view_base {
@@ -30,10 +30,10 @@ struct CopyableView : std::ranges::view_base {
constexpr CopyableView(int start = 0) : start_(start) {}
constexpr CopyableView(CopyableView const&) = default;
constexpr CopyableView& operator=(CopyableView const&) = default;
- constexpr friend int* begin(CopyableView& view) { return globalBuff + view.start_; }
- constexpr friend int* begin(CopyableView const& view) { return globalBuff + view.start_; }
- constexpr friend int* end(CopyableView&) { return globalBuff + 8; }
- constexpr friend int* end(CopyableView const&) { return globalBuff + 8; }
+ friend constexpr int* begin(CopyableView& view) { return globalBuff + view.start_; }
+ friend constexpr int* begin(CopyableView const& view) { return globalBuff + view.start_; }
+ friend constexpr int* end(CopyableView&) { return globalBuff + 8; }
+ friend constexpr int* end(CopyableView const&) { return globalBuff + 8; }
};
using ForwardIter = forward_iterator<int*>;
@@ -41,10 +41,10 @@ struct ForwardView : std::ranges::view_base {
constexpr ForwardView() = default;
constexpr ForwardView(ForwardView&&) = default;
constexpr ForwardView& operator=(ForwardView&&) = default;
- constexpr friend ForwardIter begin(ForwardView&) { return ForwardIter(globalBuff); }
- constexpr friend ForwardIter begin(ForwardView const&) { return ForwardIter(globalBuff); }
- constexpr friend ForwardIter end(ForwardView&) { return ForwardIter(globalBuff + 8); }
- constexpr friend ForwardIter end(ForwardView const&) { return ForwardIter(globalBuff + 8); }
+ friend constexpr ForwardIter begin(ForwardView&) { return ForwardIter(globalBuff); }
+ friend constexpr ForwardIter begin(ForwardView const&) { return ForwardIter(globalBuff); }
+ friend constexpr ForwardIter end(ForwardView&) { return ForwardIter(globalBuff + 8); }
+ friend constexpr ForwardIter end(ForwardView const&) { return ForwardIter(globalBuff + 8); }
};
struct ForwardRange {
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/types.h b/libcxx/test/std/ranges/range.adaptors/range.transform/types.h
index 89dd0849582c2..1f5fa646c3019 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/types.h
@@ -16,10 +16,10 @@ struct ContiguousView : std::ranges::view_base {
constexpr ContiguousView(int* ptr = globalBuff, int start = 0) : start_(start), ptr_(ptr) {}
constexpr ContiguousView(ContiguousView&&) = default;
constexpr ContiguousView& operator=(ContiguousView&&) = default;
- constexpr friend int* begin(ContiguousView& view) { return view.ptr_ + view.start_; }
- constexpr friend int* begin(ContiguousView const& view) { return view.ptr_ + view.start_; }
- constexpr friend int* end(ContiguousView& view) { return view.ptr_ + 8; }
- constexpr friend int* end(ContiguousView const& view) { return view.ptr_ + 8; }
+ friend constexpr int* begin(ContiguousView& view) { return view.ptr_ + view.start_; }
+ friend constexpr int* begin(ContiguousView const& view) { return view.ptr_ + view.start_; }
+ friend constexpr int* end(ContiguousView& view) { return view.ptr_ + 8; }
+ friend constexpr int* end(ContiguousView const& view) { return view.ptr_ + 8; }
};
struct CopyableView : std::ranges::view_base {
@@ -27,10 +27,10 @@ struct CopyableView : std::ranges::view_base {
constexpr CopyableView(int start = 0) : start_(start) {}
constexpr CopyableView(CopyableView const&) = default;
constexpr CopyableView& operator=(CopyableView const&) = default;
- constexpr friend int* begin(CopyableView& view) { return globalBuff + view.start_; }
- constexpr friend int* begin(CopyableView const& view) { return globalBuff + view.start_; }
- constexpr friend int* end(CopyableView&) { return globalBuff + 8; }
- constexpr friend int* end(CopyableView const&) { return globalBuff + 8; }
+ friend constexpr int* begin(CopyableView& view) { return globalBuff + view.start_; }
+ friend constexpr int* begin(CopyableView const& view) { return globalBuff + view.start_; }
+ friend constexpr int* end(CopyableView&) { return globalBuff + 8; }
+ friend constexpr int* end(CopyableView const&) { return globalBuff + 8; }
};
using ForwardIter = forward_iterator<int*>;
@@ -39,10 +39,10 @@ struct ForwardView : std::ranges::view_base {
constexpr ForwardView(int* ptr = globalBuff) : ptr_(ptr) {}
constexpr ForwardView(ForwardView&&) = default;
constexpr ForwardView& operator=(ForwardView&&) = default;
- constexpr friend ForwardIter begin(ForwardView& view) { return ForwardIter(view.ptr_); }
- constexpr friend ForwardIter begin(ForwardView const& view) { return ForwardIter(view.ptr_); }
- constexpr friend ForwardIter end(ForwardView& view) { return ForwardIter(view.ptr_ + 8); }
- constexpr friend ForwardIter end(ForwardView const& view) { return ForwardIter(view.ptr_ + 8); }
+ friend constexpr ForwardIter begin(ForwardView& view) { return ForwardIter(view.ptr_); }
+ friend constexpr ForwardIter begin(ForwardView const& view) { return ForwardIter(view.ptr_); }
+ friend constexpr ForwardIter end(ForwardView& view) { return ForwardIter(view.ptr_ + 8); }
+ friend constexpr ForwardIter end(ForwardView const& view) { return ForwardIter(view.ptr_ + 8); }
};
using ForwardRange = test_common_range<forward_iterator>;
diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
index a23b54ebe260b..2ab8e7f261395 100644
--- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
+++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/emplace.pass.cpp
@@ -31,7 +31,7 @@ class X
constexpr X(int i) : i_(i) {}
constexpr X(int i, int j) : i_(i), j_(j) {}
- constexpr friend bool operator==(const X& x, const X& y)
+ friend constexpr bool operator==(const X& x, const X& y)
{return x.i_ == y.i_ && x.j_ == y.j_;}
};
diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
index a77c1a103fce4..3301264dee34a 100644
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -848,25 +848,25 @@ class stride_counting_iterator {
return *this;
}
- constexpr friend stride_counting_iterator operator+(stride_counting_iterator i,
diff erence_type const n)
+ friend constexpr stride_counting_iterator operator+(stride_counting_iterator i,
diff erence_type const n)
requires std::random_access_iterator<I>
{
return i += n;
}
- constexpr friend stride_counting_iterator operator+(
diff erence_type const n, stride_counting_iterator i)
+ friend constexpr stride_counting_iterator operator+(
diff erence_type const n, stride_counting_iterator i)
requires std::random_access_iterator<I>
{
return i += n;
}
- constexpr friend stride_counting_iterator operator-(stride_counting_iterator i,
diff erence_type const n)
+ friend constexpr stride_counting_iterator operator-(stride_counting_iterator i,
diff erence_type const n)
requires std::random_access_iterator<I>
{
return i -= n;
}
- constexpr friend
diff erence_type operator-(stride_counting_iterator const& x, stride_counting_iterator const& y)
+ friend constexpr
diff erence_type operator-(stride_counting_iterator const& x, stride_counting_iterator const& y)
requires std::sized_sentinel_for<I, I>
{
return x.base() - y.base();
@@ -884,25 +884,25 @@ class stride_counting_iterator {
return base_ == last;
}
- constexpr friend bool operator<(stride_counting_iterator const& x, stride_counting_iterator const& y)
+ friend constexpr bool operator<(stride_counting_iterator const& x, stride_counting_iterator const& y)
requires std::random_access_iterator<I>
{
return x.base_ < y.base_;
}
- constexpr friend bool operator>(stride_counting_iterator const& x, stride_counting_iterator const& y)
+ friend constexpr bool operator>(stride_counting_iterator const& x, stride_counting_iterator const& y)
requires std::random_access_iterator<I>
{
return y < x;
}
- constexpr friend bool operator<=(stride_counting_iterator const& x, stride_counting_iterator const& y)
+ friend constexpr bool operator<=(stride_counting_iterator const& x, stride_counting_iterator const& y)
requires std::random_access_iterator<I>
{
return !(y < x);
}
- constexpr friend bool operator>=(stride_counting_iterator const& x, stride_counting_iterator const& y)
+ friend constexpr bool operator>=(stride_counting_iterator const& x, stride_counting_iterator const& y)
requires std::random_access_iterator<I>
{
return !(x < y);
diff --git a/libcxx/test/support/type_classification/swappable.h b/libcxx/test/support/type_classification/swappable.h
index f7916e4b06460..ebbac912072b4 100644
--- a/libcxx/test/support/type_classification/swappable.h
+++ b/libcxx/test/support/type_classification/swappable.h
@@ -34,7 +34,7 @@ class lvalue_adl_swappable {
return *this;
}
- constexpr friend void swap(lvalue_adl_swappable& x,
+ friend constexpr void swap(lvalue_adl_swappable& x,
lvalue_adl_swappable& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -70,7 +70,7 @@ class lvalue_rvalue_adl_swappable {
return *this;
}
- constexpr friend void swap(lvalue_rvalue_adl_swappable& x,
+ friend constexpr void swap(lvalue_rvalue_adl_swappable& x,
lvalue_rvalue_adl_swappable&& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -107,7 +107,7 @@ class rvalue_lvalue_adl_swappable {
return *this;
}
- constexpr friend void swap(rvalue_lvalue_adl_swappable&& x,
+ friend constexpr void swap(rvalue_lvalue_adl_swappable&& x,
rvalue_lvalue_adl_swappable& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -142,7 +142,7 @@ class rvalue_adl_swappable {
return *this;
}
- constexpr friend void swap(rvalue_adl_swappable&& x,
+ friend constexpr void swap(rvalue_adl_swappable&& x,
rvalue_adl_swappable&& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -179,7 +179,7 @@ class non_move_constructible_adl_swappable {
return *this;
}
- constexpr friend void swap(non_move_constructible_adl_swappable& x,
+ friend constexpr void swap(non_move_constructible_adl_swappable& x,
non_move_constructible_adl_swappable& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -212,7 +212,7 @@ class non_move_assignable_adl_swappable {
constexpr non_move_assignable_adl_swappable&
operator=(non_move_assignable_adl_swappable&& other) noexcept = delete;
- constexpr friend void swap(non_move_assignable_adl_swappable& x,
+ friend constexpr void swap(non_move_assignable_adl_swappable& x,
non_move_assignable_adl_swappable& y) noexcept {
std::ranges::swap(x.value_, y.value_);
}
@@ -248,7 +248,7 @@ class throwable_adl_swappable {
return *this;
}
- constexpr friend void swap(throwable_adl_swappable& X,
+ friend constexpr void swap(throwable_adl_swappable& X,
throwable_adl_swappable& Y) noexcept(false) {
std::ranges::swap(X.value_, Y.value_);
}
More information about the libcxx-commits
mailing list