Skip to content

Commit 8df8512

Browse files
authored
Merge 2024-11 LWG Motion 4
P3379R0 Constrain std::expected equality operators
2 parents 615947a + dbbef7f commit 8df8512

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

source/support.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@
620620
#define @\defnlibxname{cpp_lib_constexpr_typeinfo}@ 202106L // freestanding, also in \libheader{typeinfo}
621621
#define @\defnlibxname{cpp_lib_constexpr_utility}@ 201811L // freestanding, also in \libheader{utility}
622622
#define @\defnlibxname{cpp_lib_constexpr_vector}@ 201907L // also in \libheader{vector}
623-
#define @\defnlibxname{cpp_lib_constrained_equality}@ 202403L // freestanding,
624-
// also in \libheader{utility}, \libheader{tuple}, \libheader{optional}, \libheader{variant}
623+
#define @\defnlibxname{cpp_lib_constrained_equality}@ 202411L // freestanding,
624+
// also in \libheader{utility}, \libheader{tuple}, \libheader{optional}, \libheader{variant}, \libheader{expected}
625625
#define @\defnlibxname{cpp_lib_containers_ranges}@ 202202L
626626
// also in \libheader{vector}, \libheader{list}, \libheader{forward_list}, \libheader{map}, \libheader{set}, \libheader{unordered_map}, \libheader{unordered_set},
627627
// \libheader{deque}, \libheader{queue}, \libheader{stack}, \libheader{string}

source/utilities.tex

+6-5
Original file line numberDiff line numberDiff line change
@@ -8775,7 +8775,7 @@
87758775

87768776
\begin{itemdescr}
87778777
\pnum
8778-
\mandates
8778+
\constraints
87798779
The expressions \tcode{*x == *y} and \tcode{x.error() == y.error()}
87808780
are well-formed and their results are convertible to \tcode{bool}.
87818781

@@ -8793,7 +8793,8 @@
87938793

87948794
\begin{itemdescr}
87958795
\pnum
8796-
\mandates
8796+
\constraints
8797+
\tcode{T2} is not a specialization of \tcode{expected}.
87978798
The expression \tcode{*x == v} is well-formed and
87988799
its result is convertible to \tcode{bool}.
87998800
\begin{note}
@@ -8812,7 +8813,7 @@
88128813

88138814
\begin{itemdescr}
88148815
\pnum
8815-
\mandates
8816+
\constraints
88168817
The expression \tcode{x.error() == e.error()} is well-formed and
88178818
its result is convertible to \tcode{bool}.
88188819

@@ -9733,7 +9734,7 @@
97339734

97349735
\begin{itemdescr}
97359736
\pnum
9736-
\mandates
9737+
\constraints
97379738
The expression \tcode{x.error() == y.error()} is well-formed and
97389739
its result is convertible to \tcode{bool}.
97399740

@@ -9751,7 +9752,7 @@
97519752

97529753
\begin{itemdescr}
97539754
\pnum
9754-
\mandates
9755+
\constraints
97559756
The expression \tcode{x.error() == e.error()} is well-formed and
97569757
its result is convertible to \tcode{bool}.
97579758

0 commit comments

Comments
 (0)