Skip to content

Commit 9de078c

Browse files
committed
[everywhere] Rename concept 'ThreeWayComparable' to 'three_way_comparable'.
1 parent c38c929 commit 9de078c

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

source/containers.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9398,7 +9398,7 @@
93989398
bool operator<=(const queue<T, Container>& x, const queue<T, Container>& y);
93999399
template<class T, class Container>
94009400
bool operator>=(const queue<T, Container>& x, const queue<T, Container>& y);
9401-
template<class T, ThreeWayComparable Container>
9401+
template<class T, three_way_comparable Container>
94029402
compare_three_way_result_t<Container>
94039403
operator<=>(const queue<T, Container>& x, const queue<T, Container>& y);
94049404

@@ -9440,7 +9440,7 @@
94409440
bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
94419441
template<class T, class Container>
94429442
bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
9443-
template<class T, ThreeWayComparable Container>
9443+
template<class T, three_way_comparable Container>
94449444
compare_three_way_result_t<Container>
94459445
operator<=>(const stack<T, Container>& x, const stack<T, Container>& y);
94469446

@@ -9678,7 +9678,7 @@
96789678

96799679
\indexlibrary{\idxcode{operator<=>}!\idxcode{queue}}%
96809680
\begin{itemdecl}
9681-
template<class T, ThreeWayComparable Container>
9681+
template<class T, three_way_comparable Container>
96829682
compare_three_way_result_t<Container>
96839683
operator<=>(const queue<T, Container>& x, const queue<T, Container>& y);
96849684
\end{itemdecl}
@@ -10238,7 +10238,7 @@
1023810238

1023910239
\indexlibrary{\idxcode{operator<=>}!\idxcode{stack}}%
1024010240
\begin{itemdecl}
10241-
template<class T, ThreeWayComparable Container>
10241+
template<class T, three_way_comparable Container>
1024210242
compare_three_way_result_t<Container>
1024310243
operator<=>(const stack<T, Container>& x, const stack<T, Container>& y);
1024410244
\end{itemdecl}

source/ranges.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2043,7 +2043,7 @@
20432043
requires totally_ordered<W>;
20442044
friend constexpr compare_three_way_result_t<W> operator<=>(
20452045
const iterator& x, const iterator& y)
2046-
requires totally_ordered<W> && ThreeWayComparable<W>;
2046+
requires totally_ordered<W> && three_way_comparable<W>;
20472047

20482048
friend constexpr iterator operator+(iterator i, difference_type n)
20492049
requires @\placeholdernc{advanceable}@<W>;
@@ -2283,7 +2283,7 @@
22832283
\begin{itemdecl}
22842284
friend constexpr compare_three_way_result_t<W>
22852285
operator<=>(const iterator& x, const iterator& y)
2286-
requires totally_ordered<W> && ThreeWayComparable<W>;
2286+
requires totally_ordered<W> && three_way_comparable<W>;
22872287
\end{itemdecl}
22882288

22892289
\begin{itemdescr}
@@ -3272,7 +3272,7 @@
32723272
requires random_access_range<Base>;
32733273
friend constexpr compare_three_way_result_t<iterator_t<Base>>
32743274
operator<=>(const iterator& x, const iterator& y)
3275-
requires random_access_range<Base> && ThreeWayComparable<iterator_t<Base>>;
3275+
requires random_access_range<Base> && three_way_comparable<iterator_t<Base>>;
32763276

32773277
friend constexpr iterator operator+(iterator i, difference_type n)
32783278
requires random_access_range<Base>;
@@ -3513,7 +3513,7 @@
35133513
\begin{itemdecl}
35143514
friend constexpr compare_three_way_result_t<iterator_t<Base>>
35153515
operator<=>(const iterator& x, const iterator& y)
3516-
requires random_access_range<Base> && ThreeWayComparable<iterator_t<Base>>;
3516+
requires random_access_range<Base> && three_way_comparable<iterator_t<Base>>;
35173517
\end{itemdecl}
35183518

35193519
\begin{itemdescr}
@@ -5955,7 +5955,7 @@
59555955
requires random_access_range<base_t>;
59565956
friend constexpr compare_three_way_result_t<iterator_t<base_t>>
59575957
operator<=>(const iterator& x, const iterator& y)
5958-
requires random_access_range<base_t> && ThreeWayComparable<iterator_t<base_t>>;
5958+
requires random_access_range<base_t> && three_way_comparable<iterator_t<base_t>>;
59595959

59605960
friend constexpr iterator operator+(const iterator& x, difference_type y)
59615961
requires random_access_range<base_t>;
@@ -6171,7 +6171,7 @@
61716171
\begin{itemdecl}
61726172
friend constexpr compare_three_way_result_t<iterator_t<base_t>>
61736173
operator<=>(const iterator& x, const iterator& y)
6174-
requires random_access_range<base_t> && ThreeWayComparable<iterator_t<base_t>>;
6174+
requires random_access_range<base_t> && three_way_comparable<iterator_t<base_t>>;
61756175
\end{itemdecl}
61766176

61776177
\begin{itemdescr}

source/support.tex

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4021,9 +4021,9 @@
40214021
template<class... Ts>
40224022
using common_comparison_category_t = typename common_comparison_category<Ts...>::type;
40234023

4024-
// \ref{cmp.concept}, concept \tcode{ThreeWayComparable}
4024+
// \ref{cmp.concept}, concept \tcode{three_way_comparable}
40254025
template<class T, class Cat = partial_ordering>
4026-
concept ThreeWayComparable = @\seebelow@;
4026+
concept three_way_comparable = @\seebelow@;
40274027
template<class T, class U, class Cat = partial_ordering>
40284028
concept ThreeWayComparableWith = @\seebelow@;
40294029

@@ -4709,7 +4709,7 @@
47094709
\end{note}
47104710
\end{itemdescr}
47114711

4712-
\rSec2[cmp.concept]{Concept \tcode{ThreeWayComparable}}
4712+
\rSec2[cmp.concept]{Concept \tcode{three_way_comparable}}
47134713

47144714
\begin{codeblock}
47154715
template <typename T, typename Cat>
@@ -4757,9 +4757,10 @@
47574757
\tcode{bool(u <= t) == bool(t >= u)} is \tcode{true}.
47584758
\end{itemize}
47594759

4760+
\indexlibrary{\idxcode{three_way_comparable}}%
47604761
\begin{codeblock}
47614762
template <typename T, typename Cat = partial_ordering>
4762-
concept ThreeWayComparable =
4763+
concept three_way_comparable =
47634764
@\placeholder{weakly-equality-comparable-with}@<T, T> &&
47644765
(!convertible_to<Cat, partial_ordering> || @\placeholder{partially-ordered-with}@<T, T>) &&
47654766
requires(const remove_reference_t<T>& a, const remove_reference_t<T>& b) {
@@ -4771,7 +4772,7 @@
47714772
Let \tcode{a} and \tcode{b} be lvalues
47724773
of type \tcode{const remove_reference_t<T>}.
47734774
\tcode{T} and \tcode{Cat}
4774-
model \tcode{\libconcept{ThreeWayComparable}<T, Cat>} only if:
4775+
model \tcode{\libconcept{three_way_comparable}<T, Cat>} only if:
47754776
\begin{itemize}
47764777
\item
47774778
\tcode{(a <=> b == 0) == bool(a == b)} is \tcode{true};
@@ -4804,10 +4805,10 @@
48044805
concept ThreeWayComparableWith =
48054806
@\placeholder{weakly-equality-comparable-with}@<T, U> &&
48064807
(!convertible_to<Cat, partial_ordering> || @\placeholder{partially-ordered-with}@<T, U>) &&
4807-
ThreeWayComparable<T, Cat> &&
4808-
ThreeWayComparable<U, Cat> &&
4808+
three_way_comparable<T, Cat> &&
4809+
three_way_comparable<U, Cat> &&
48094810
common_reference_with<const remove_reference_t<T>&, const remove_reference_t<U>&> &&
4810-
ThreeWayComparable<
4811+
three_way_comparable<
48114812
common_reference_t<const remove_reference_t<T>&, const remove_reference_t<U>&>, Cat> &&
48124813
requires(const remove_reference_t<T>& t, const remove_reference_t<U>& u) {
48134814
{ t <=> u } -> @\placeholder{compares-as}@<Cat>;

source/time.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,7 @@
17011701
\indexlibrarymember{operator<=>}{duration}%
17021702
\begin{itemdecl}
17031703
template<class Rep1, class Period1, class Rep2, class Period2>
1704-
requires ThreeWayComparable<typename CT::rep>
1704+
requires three_way_comparable<typename CT::rep>
17051705
constexpr auto operator<=>(const duration<Rep1, Period1>& lhs,
17061706
const duration<Rep2, Period2>& rhs);
17071707
\end{itemdecl}

source/utilities.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,7 +3618,7 @@
36183618
constexpr bool operator<=(const variant<Types...>&, const variant<Types...>&);
36193619
template<class... Types>
36203620
constexpr bool operator>=(const variant<Types...>&, const variant<Types...>&);
3621-
template<class... Types> requires (ThreeWayComparable<Types> && ...)
3621+
template<class... Types> requires (three_way_comparable<Types> && ...)
36223622
constexpr common_comparison_category_t<compare_three_way_result_t<Types>...>
36233623
operator<=>(const variant<Types...>&, const variant<Types...>&);
36243624

@@ -4712,7 +4712,7 @@
47124712

47134713
\indexlibrarymember{operator<=>}{variant}%
47144714
\begin{itemdecl}
4715-
template<class... Types> requires (ThreeWayComparable<Types> && ...)
4715+
template<class... Types> requires (three_way_comparable<Types> && ...)
47164716
constexpr common_comparison_category_t<compare_three_way_result_t<Types>...>
47174717
operator<=>(const variant<Types...>& v, const variant<Types...>& w);
47184718
\end{itemdecl}

0 commit comments

Comments
 (0)