Skip to content

Commit e3a5f29

Browse files
committed
[util.smartptr.shared.cmp] Fix overfull hbox.
[unique.ptr.special] Adjust to match changes to [util.smartptr.shared.cmp] [tuple.cnstr] Adjust wording to avoid awkward linebreak within code fragment.
1 parent 1e66edb commit e3a5f29

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

source/utilities.tex

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,10 +1369,10 @@
13691369
\item
13701370
\tcode{is_constructible_v<$\tcode{T}_i$, const $\tcode{U}_i$\&>} is \tcode{true} for all $i$, and
13711371
\item
1372+
either
13721373
\tcode{sizeof...(Types) != 1}, or
1373-
(when \tcode{Types...} expands to \tcode{T} and \tcode{UTypes...} expands to \tcode{U})\linebreak
1374-
\tcode{!is_convertible_v<const tuple<U>\&, T> \&\& !is_constructible_v<T, const tuple<U>\&>\linebreak{}\&\& !is_same_v<T, U>}
1375-
is \tcode{true}.
1374+
(when \tcode{Types...} expands to \tcode{T} and \tcode{UTypes...} expands to \tcode{U})
1375+
\tcode{is_convertible_v<const tuple<U>\&, T>}, \tcode{is_constructible_v<T, const tuple<U>\&>}, and \tcode{is_same_v<T, U>} are all \tcode{false}.
13761376
\end{itemize}
13771377
The constructor is explicit if and only if
13781378
\tcode{is_convertible_v<const $\tcode{U}_i$\&, $\tcode{T}_i$>} is \tcode{false}
@@ -1399,10 +1399,11 @@
13991399
\item
14001400
\tcode{is_constructible_v<$\tcode{T}_i$, $\tcode{U}_i$\&\&>} is \tcode{true} for all $i$, and
14011401
\item
1402+
either
14021403
\tcode{sizeof...(Types) != 1}, or
1403-
(when \tcode{Types...} expands to \tcode{T} and \tcode{UTypes...} expands to \tcode{U})\linebreak
1404-
\tcode{!is_convertible_v<tuple<U>, T> \&\& !is_constructible_v<T, tuple<U>> \&\&\linebreak{}!is_same_v<T, U>}
1405-
is \tcode{true}.
1404+
(when \tcode{Types...} expands to \tcode{T} and \tcode{UTypes...} expands to \tcode{U})
1405+
\tcode{is_convertible_v<tuple<U>, T>}, \tcode{is_constructible_v<T, tuple<U>>},
1406+
and \tcode{is_same_v<T, U>} are all \tcode{false}.
14061407
\end{itemize}
14071408
The constructor is explicit if and only if
14081409
\tcode{is_convertible_v<$\tcode{U}_i$\&\&, $\tcode{T}_i$>} is \tcode{false}
@@ -8989,9 +8990,13 @@
89898990
\pnum
89908991
\returns
89918992
The first function template returns
8992-
\tcode{less<unique_ptr<T, D>::pointer>()(x.get(),\\nullptr)}.
8993+
\begin{codeblock}
8994+
less<unique_ptr<T, D>::pointer>()(x.get(), nullptr)
8995+
\end{codeblock}
89938996
The second function template returns
8994-
\tcode{less<unique_ptr<T, D>::pointer>()(nullptr, x.get())}.
8997+
\begin{codeblock}
8998+
less<unique_ptr<T, D>::pointer>()(nullptr, x.get())
8999+
\end{codeblock}
89959000
\end{itemdescr}
89969001

89979002
\indexlibrarymember{operator>}{unique_ptr}%
@@ -9990,9 +9995,13 @@
99909995
\pnum
99919996
\returns
99929997
The first function template returns
9993-
\tcode{less<typename shared_ptr<T>::element_type*>()(a.get(), nullptr)}.
9998+
\begin{codeblock}
9999+
less<typename shared_ptr<T>::element_type*>()(a.get(), nullptr)
10000+
\end{codeblock}
999410001
The second function template returns
9995-
\tcode{less<typename shared_ptr<T>::element_type*>()(nullptr, a.get())}.
10002+
\begin{codeblock}
10003+
less<typename shared_ptr<T>::element_type*>()(nullptr, a.get())
10004+
\end{codeblock}
999610005
\end{itemdescr}
999710006

999810007
\indexlibrarymember{operator>}{shared_ptr}%

0 commit comments

Comments
 (0)