Skip to content

Commit 0b8603d

Browse files
committed
Remove braces in wording where not needed
Style issue.
1 parent b0c298a commit 0b8603d

File tree

1 file changed

+10
-20
lines changed

1 file changed

+10
-20
lines changed

papers/P2988/new-optional.tex

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,9 +1152,7 @@
11521152
\effects
11531153
Equivalent to:
11541154
\begin{codeblock}
1155-
if (rhs.has_value()) {
1156-
@\exposid{convert-ref-init-val}@(*rhs);
1157-
}
1155+
if (rhs.has_value()) @\exposid{convert-ref-init-val}@(*rhs);
11581156
\end{codeblock}
11591157

11601158
\pnum
@@ -1186,9 +1184,7 @@
11861184
\effects
11871185
Equivalent to:
11881186
\begin{codeblock}
1189-
if (rhs.has_value()) {
1190-
@\exposid{convert-ref-init-val}@(*rhs);
1191-
}
1187+
if (rhs.has_value()) @\exposid{convert-ref-init-val}@(*rhs);
11921188
\end{codeblock}
11931189

11941190

@@ -1220,9 +1216,7 @@
12201216
\effects
12211217
Equivalent to:
12221218
\begin{codeblock}
1223-
if (rhs.has_value()) {
1224-
@\exposid{convert-ref-init-val}@(*std::move(rhs));
1225-
}
1219+
if (rhs.has_value()) @\exposid{convert-ref-init-val}@(*std::move(rhs));
12261220
\end{codeblock}
12271221

12281222
\pnum
@@ -1253,9 +1247,7 @@
12531247
\effects
12541248
Equivalent to:
12551249
\begin{codeblock}
1256-
if (rhs.has_value()) {
1257-
@\exposid{convert-ref-init-val}@(*std::move(rhs));
1258-
}
1250+
if (rhs.has_value()) @\exposid{convert-ref-init-val}@(*std::move(rhs));
12591251
\end{codeblock}
12601252

12611253
\pnum
@@ -1474,11 +1466,10 @@
14741466
\effects
14751467
Equivalent to:
14761468
\begin{codeblock}
1477-
if (has_value()) {
1469+
if (has_value())
14781470
return invoke(std::forward<F>(f), *@\exposid{val}@);
1479-
} else {
1471+
else
14801472
return remove_cvref_t<U>();
1481-
}
14821473
\end{codeblock}
14831474
\end{itemdescr}
14841475

@@ -1518,11 +1509,10 @@
15181509
\effects
15191510
Equivalent to:
15201511
\begin{codeblock}
1521-
if (has_value()) {
1522-
return *@\exposid{val}@;
1523-
} else {
1524-
return std::forward<F>(f)();
1525-
}
1512+
if (has_value())
1513+
return *@\exposid{val}@;
1514+
else
1515+
return std::forward<F>(f)();
15261516
\end{codeblock}
15271517
\end{itemdescr}
15281518

0 commit comments

Comments
 (0)