Skip to content

Commit 3698000

Browse files
zygoloidzygoloid
committed
[everywhere] Rename concept 'ThreeWayComparableWith' to 'three_way_comparable_with'.
1 parent 9de078c commit 3698000

File tree

5 files changed

+25
-23
lines changed

5 files changed

+25
-23
lines changed

‎source/iterators.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
constexpr bool operator>=(
293293
const reverse_iterator<Iterator1>& x,
294294
const reverse_iterator<Iterator2>& y);
295-
template<class Iterator1, ThreeWayComparableWith<Iterator1, weak_equality> Iterator2>
295+
template<class Iterator1, three_way_comparable_with<Iterator1, weak_equality> Iterator2>
296296
constexpr compare_three_way_result_t<Iterator1, Iterator2>
297297
operator<=>(const reverse_iterator<Iterator1>& x,
298298
const reverse_iterator<Iterator2>& y);
@@ -347,7 +347,7 @@
347347
template<class Iterator1, class Iterator2>
348348
constexpr bool operator>=(
349349
const move_iterator<Iterator1>& x, const move_iterator<Iterator2>& y);
350-
template<class Iterator1, ThreeWayComparableWith<Iterator1, weak_equality> Iterator2>
350+
template<class Iterator1, three_way_comparable_with<Iterator1, weak_equality> Iterator2>
351351
constexpr compare_three_way_result_t<Iterator1, Iterator2>
352352
operator<=>(const move_iterator<Iterator1>& x,
353353
const move_iterator<Iterator2>& y);
@@ -3521,7 +3521,7 @@
35213521

35223522
\indexlibrarymember{operator<=>}{reverse_iterator}%
35233523
\begin{itemdecl}
3524-
template<class Iterator1, ThreeWayComparableWith<Iterator1, weak_equality> Iterator2>
3524+
template<class Iterator1, three_way_comparable_with<Iterator1, weak_equality> Iterator2>
35253525
constexpr compare_three_way_result_t<Iterator1, Iterator2>
35263526
operator<=>(const reverse_iterator<Iterator1>& x,
35273527
const reverse_iterator<Iterator2>& y);
@@ -4438,7 +4438,7 @@
44384438

44394439
\indexlibrarymember{operator<=>}{move_iterator}%
44404440
\begin{itemdecl}
4441-
template<class Iterator1, ThreeWayComparableWith<Iterator1, weak_equality> Iterator2>
4441+
template<class Iterator1, three_way_comparable_with<Iterator1, weak_equality> Iterator2>
44424442
constexpr compare_three_way_result_t<Iterator1, Iterator2>
44434443
operator<=>(const move_iterator<Iterator1>& x,
44444444
const move_iterator<Iterator2>& y);

‎source/lib-intro.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
{ u < t } -> convertible_to<bool>;
723723
}
724724
{
725-
if constexpr (ThreeWayComparableWith<T, U>) {
725+
if constexpr (three_way_comparable_with<T, U>) {
726726
return t <=> u;
727727
} else {
728728
if (t < u) return weak_ordering::less;

‎source/support.tex

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4025,7 +4025,7 @@
40254025
template<class T, class Cat = partial_ordering>
40264026
concept three_way_comparable = @\seebelow@;
40274027
template<class T, class U, class Cat = partial_ordering>
4028-
concept ThreeWayComparableWith = @\seebelow@;
4028+
concept three_way_comparable_with = @\seebelow@;
40294029

40304030
// \ref{cmp.result}, result of three-way comparison
40314031
template<class T, class U = T> struct compare_three_way_result;
@@ -4800,9 +4800,10 @@
48004800
\libconcept{totally_ordered}\iref{concept.stricttotallyordered}.
48014801
\end{itemize}
48024802

4803+
\indexlibrary{\idxcode{three_way_comparable_with}}%
48034804
\begin{codeblock}
48044805
template <typename T, typename U, typename Cat = partial_ordering>
4805-
concept ThreeWayComparableWith =
4806+
concept three_way_comparable_with =
48064807
@\placeholder{weakly-equality-comparable-with}@<T, U> &&
48074808
(!convertible_to<Cat, partial_ordering> || @\placeholder{partially-ordered-with}@<T, U>) &&
48084809
three_way_comparable<T, Cat> &&
@@ -4823,7 +4824,7 @@
48234824
Let \tcode{C} be
48244825
\tcode{common_reference_t<const remove_reference_t<T>\&, const remove_reference_t<U>\&>}.
48254826
\tcode{T}, \tcode{U}, and \tcode{Cat}
4826-
model \tcode{\libconcept{ThreeWayComparableWith}<T, U, Cat>} only if:
4827+
model \tcode{\libconcept{three_way_comparable_with}<T, U, Cat>} only if:
48274828
\begin{itemize}
48284829
\item
48294830
\tcode{t <=> u} and \tcode{u <=> t} have the same domain;
@@ -4888,10 +4889,11 @@
48884889
\end{codeblock}
48894890
resolves to a built-in operator comparing pointers.
48904891

4892+
\indexlibrary{\idxcode{compare_three_way}}%
48914893
\begin{codeblock}
48924894
struct compare_three_way {
48934895
template<class T, class U>
4894-
requires ThreeWayComparableWith<T, U> || @\placeholdernc{BUILTIN-PTR-THREE-WAY}@(T, U)
4896+
requires three_way_comparable_with<T, U> || @\placeholdernc{BUILTIN-PTR-THREE-WAY}@(T, U)
48954897
constexpr auto operator()(T&& t, U&& u) const;
48964898

48974899
using is_transparent = @\unspec@;

‎source/time.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
template<class Clock, class Duration1, class Duration2>
208208
constexpr bool operator>=(const time_point<Clock, Duration1>& lhs,
209209
const time_point<Clock, Duration2>& rhs);
210-
template<class Clock, class Duration1, ThreeWayComparableWith<Duration1> Duration2>
210+
template<class Clock, class Duration1, three_way_comparable_with<Duration1> Duration2>
211211
constexpr auto operator<=>(const time_point<Clock, Duration1>& lhs,
212212
const time_point<Clock, Duration2>& rhs);
213213

@@ -790,7 +790,7 @@
790790
bool operator>=(const leap& x, const sys_time<Duration>& y);
791791
template<class Duration>
792792
bool operator>=(const sys_time<Duration>& x, const leap& y);
793-
template<ThreeWayComparableWith<sys_seconds> Duration>
793+
template<three_way_comparable_with<sys_seconds> Duration>
794794
auto operator<=>(const leap& x, const sys_time<Duration>& y);
795795

796796
// \ref{time.zone.link}, class \tcode{link}
@@ -2358,7 +2358,7 @@
23582358
\indexlibrarymember{operator>=}{time_point}%
23592359
\begin{itemdecl}
23602360
template<class Clock, class Duration1,
2361-
ThreeWayComparableWith<Duration1> Duration2>
2361+
three_way_comparable_with<Duration1> Duration2>
23622362
constexpr auto operator<=>(const time_point<Clock, Duration1>& lhs,
23632363
const time_point<Clock, Duration2>& rhs);
23642364
\end{itemdecl}
@@ -9654,7 +9654,7 @@
96549654
\indexlibrarymember{operator<=>}{leap}%
96559655
\indexlibrarymember{operator<=>}{sys_time}%
96569656
\begin{itemdecl}
9657-
template<ThreeWayComparableWith<sys_seconds> Duration>
9657+
template<three_way_comparable_with<sys_seconds> Duration>
96589658
constexpr auto operator<=>(const leap& x, const sys_time<Duration>& y) noexcept;
96599659
\end{itemdecl}
96609660

‎source/utilities.tex

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,7 +2061,7 @@
20612061
constexpr bool operator<=(const optional<T>&, const optional<U>&);
20622062
template<class T, class U>
20632063
constexpr bool operator>=(const optional<T>&, const optional<U>&);
2064-
template<class T, ThreeWayComparableWith<T> U>
2064+
template<class T, three_way_comparable_with<T> U>
20652065
constexpr compare_three_way_result_t<T,U>
20662066
operator<=>(const optional<T>&, const optional<U>&);
20672067

@@ -2083,7 +2083,7 @@
20832083
template<class T, class U> constexpr bool operator<=(const T&, const optional<U>&);
20842084
template<class T, class U> constexpr bool operator>=(const optional<T>&, const U&);
20852085
template<class T, class U> constexpr bool operator>=(const T&, const optional<U>&);
2086-
template<class T, ThreeWayComparableWith<T> U>
2086+
template<class T, three_way_comparable_with<T> U>
20872087
constexpr compare_three_way_result_t<T,U>
20882088
operator<=>(const optional<T>&, const U&);
20892089

@@ -3206,7 +3206,7 @@
32063206

32073207
\indexlibrarymember{operator<=>}{optional}%
32083208
\begin{itemdecl}
3209-
template<class T, ThreeWayComparableWith<T> U>
3209+
template<class T, three_way_comparable_with<T> U>
32103210
constexpr compare_three_way_result_t<T,U>
32113211
operator<=>(const optional<T>& x, const optional<U>& y);
32123212
\end{itemdecl}
@@ -3446,7 +3446,7 @@
34463446

34473447
\indexlibrarymember{operator<=>}{optional}%
34483448
\begin{itemdecl}
3449-
template<class T, ThreeWayComparableWith<T> U>
3449+
template<class T, three_way_comparable_with<T> U>
34503450
constexpr compare_three_way_result_t<T,U>
34513451
operator<=>(const optional<T>& x, const U& v);
34523452
\end{itemdecl}
@@ -6681,8 +6681,8 @@
66816681
template<class T1, class D1, class T2, class D2>
66826682
bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
66836683
template<class T1, class D1, class T2, class D2>
6684-
requires ThreeWayComparableWith<typename unique_ptr<T1, D1>::pointer,
6685-
typename unique_ptr<T2, D2>::pointer>
6684+
requires three_way_comparable_with<typename unique_ptr<T1, D1>::pointer,
6685+
typename unique_ptr<T2, D2>::pointer>
66866686
compare_three_way_result_t<typename unique_ptr<T1, D1>::pointer,
66876687
typename unique_ptr<T2, D2>::pointer>
66886688
operator<=>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
@@ -6706,7 +6706,7 @@
67066706
template<class T, class D>
67076707
bool operator>=(nullptr_t, const unique_ptr<T, D>& y);
67086708
template<class T, class D>
6709-
requires ThreeWayComparableWith<typename unique_ptr<T, D>::pointer, nullptr_t>
6709+
requires three_way_comparable_with<typename unique_ptr<T, D>::pointer, nullptr_t>
67106710
compare_three_way_result_t<typename unique_ptr<T, D>::pointer, nullptr_t>
67116711
operator<=>(const unique_ptr<T, D>& x, nullptr_t);
67126712

@@ -9675,8 +9675,8 @@
96759675
\indexlibrarymember{operator<=>}{unique_ptr}%
96769676
\begin{itemdecl}
96779677
template<class T1, class D1, class T2, class D2>
9678-
requires ThreeWayComparableWith<typename unique_ptr<T1, D1>::pointer,
9679-
typename unique_ptr<T2, D2>::pointer>
9678+
requires three_way_comparable_with<typename unique_ptr<T1, D1>::pointer,
9679+
typename unique_ptr<T2, D2>::pointer>
96809680
compare_three_way_result_t<typename unique_ptr<T1, D1>::pointer,
96819681
typename unique_ptr<T2, D2>::pointer>
96829682
operator<=>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
@@ -9773,7 +9773,7 @@
97739773
\indexlibrarymember{operator<=>}{unique_ptr}%
97749774
\begin{itemdecl}
97759775
template<class T, class D>
9776-
requires ThreeWayComparableWith<typename unique_ptr<T, D>::pointer, nullptr_t>
9776+
requires three_way_comparable_with<typename unique_ptr<T, D>::pointer, nullptr_t>
97779777
compare_three_way_result_t<typename unique_ptr<T, D>::pointer, nullptr_t>
97789778
operator<=>(const unique_ptr<T, D>& x, nullptr_t);
97799779
\end{itemdecl}

0 commit comments

Comments
 (0)