Skip to content

Commit 54358d1

Browse files
committed
fixup: minor transcription mistakes
1 parent ca57dc1 commit 54358d1

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

source/utilities.tex

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6629,6 +6629,7 @@
66296629
Direct-non-list-initializes
66306630
\exposid{val} with \tcode{std::forward<Args>(args)...}.
66316631

6632+
\pnum
66326633
\throws
66336634
Any exception thrown by the initialization of \exposid{val}.
66346635
\end{itemdescr}
@@ -6723,7 +6724,7 @@
67236724
E& error() & noexcept;
67246725
const E& error() const& noexcept;
67256726
E&& error() && noexcept;
6726-
const E&& error() const&& noexcept;
6727+
const E&& error() const&& noexcept;
67276728
private:
67286729
E @\exposid{val}@; // \expos
67296730
};
@@ -7002,6 +7003,7 @@
70027003
\tcode{is_copy_constructible_v<E>} is \tcode{true}.
70037004
\end{itemize}
70047005

7006+
\pnum
70057007
This constructor is trivial if
70067008
\begin{itemize}
70077009
\item
@@ -7052,9 +7054,9 @@
70527054
This constructor is trivial if
70537055
\begin{itemize}
70547056
\item
7055-
is_trivially_move_constructible_v<T> is \tcode{true}; and
7057+
\tcode{is_trivially_move_constructible_v<T>} is \tcode{true}; and
70567058
\item
7057-
is_trivially_move_constructible_v<E> is \tcode{true}.
7059+
\tcode{is_trivially_move_constructible_v<E>} is \tcode{true}.
70587060
\end{itemize}
70597061
\end{itemdescr}
70607062

@@ -7465,8 +7467,8 @@
74657467
is \tcode{true}.
74667468
\end{itemize}
74677469

7468-
\effects
74697470
\pnum
7471+
\effects
74707472
\begin{itemize}
74717473
\item
74727474
If \tcode{has_value()} is \tcode{true},
@@ -7477,11 +7479,11 @@
74777479
@\exposid{reinit-expected}@(@\exposid{val}@, @\exposid{unex}@, std::forward<U>(v));
74787480
@\exposid{has_val}@ = true;
74797481
\end{codeblock}
7482+
\end{itemize}
74807483

74817484
\pnum
74827485
\returns
74837486
\tcode{*this}.
7484-
\end{itemize}
74857487
\end{itemdescr}
74867488

74877489
\indexlibrarymember{operator=}{expected}%
@@ -7511,7 +7513,6 @@
75117513

75127514
\pnum
75137515
\effects
7514-
\pnum
75157516
\begin{itemize}
75167517
\item
75177518
If \tcode{has_value()} is \tcode{true}, equivalent to
@@ -7540,6 +7541,7 @@
75407541
\constraints
75417542
\tcode{is_nothrow_constructible_v<T, Args...>} is \tcode{true}.
75427543

7544+
\pnum
75437545
\effects
75447546
Equivalent to:
75457547
\begin{codeblock}
@@ -7565,6 +7567,7 @@
75657567
\tcode{is_nothrow_constructible_v<T, initializer_list<U>\&, Args...>}
75667568
is \tcode{true}.
75677569

7570+
\pnum
75687571
\effects
75697572
Equivalent to:
75707573
\begin{codeblock}
@@ -7724,7 +7727,6 @@
77247727
\indexlibrarymember{operator bool}{expected}%
77257728
\indexlibrarymember{has_value}{expected}%
77267729
\begin{itemdecl}
7727-
\pnum
77287730
constexpr explicit operator bool() const noexcept;
77297731
constexpr bool has_value() const noexcept;
77307732
\end{itemdecl}
@@ -7990,7 +7992,7 @@
79907992
\begin{itemdescr}
79917993
\pnum
79927994
\effects
7993-
If \tcode{rhs.has_value()} is \tcode{false}
7995+
If \tcode{rhs.has_value()} is \tcode{false},
79947996
direct-non-list-initializes \exposid{unex} with \tcode{rhs.error()}.
79957997

79967998
\pnum
@@ -8023,7 +8025,7 @@
80238025

80248026
\pnum
80258027
\effects
8026-
If rhs.has_value() is \tcode{false},
8028+
If \tcode{rhs.has_value()} is \tcode{false},
80278029
direct-non-list-initializes \exposid{unex} with \tcode{std::move(rhs.error())}.
80288030

80298031
\pnum
@@ -8153,6 +8155,7 @@
81538155
\ensures
81548156
\tcode{has_value()} is \tcode{false}.
81558157

8158+
\pnum
81568159
\throws
81578160
Any exception thrown by the initialization of \exposid{unex}.
81588161
\end{itemdescr}
@@ -8360,9 +8363,11 @@
83608363
rhs.@\exposid{has_val}@ = true;
83618364
\end{codeblock}
83628365

8366+
\pnum
83638367
\throws
83648368
Any exception thrown by the expressions in the \effects.
83658369

8370+
\pnum
83668371
\remarks
83678372
The exception specification is
83688373
\tcode{is_nothrow_move_constructible_v<E> \&\& is_nothrow_swappable_v<E>}.
@@ -8454,6 +8459,7 @@
84548459
\expects
84558460
\tcode{has_value()} is \tcode{false}.
84568461

8462+
\pnum
84578463
\returns
84588464
\tcode{std::move(\exposid{unex})}.
84598465
\end{itemdescr}
@@ -8490,6 +8496,7 @@
84908496
The expression \tcode{x.error() == e.value()} is well-formed and
84918497
its result is convertible to \tcode{bool}.
84928498

8499+
\pnum
84938500
\returns
84948501
\tcode{!x.has_value() \&\& static_cast<bool>(x.error() == e.value())}.
84958502
\end{itemdescr}

0 commit comments

Comments
 (0)