Skip to content

Commit 7175671

Browse files
committed
[utilities] (mostly pair and tuple) minor cosmetic harmonization
1 parent 48efdfe commit 7175671

File tree

1 file changed

+10
-23
lines changed

1 file changed

+10
-23
lines changed

source/utilities.tex

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -896,8 +896,6 @@
896896

897897
\indexlibrary{\idxcode{pair}}%
898898
\begin{codeblock}
899-
// defined in header \tcode{<utility>}
900-
901899
namespace std {
902900
template <class T1, class T2>
903901
struct pair {
@@ -914,8 +912,7 @@
914912
template<class U, class V> @\EXPLICIT@ constexpr pair(const pair<U, V>& p);
915913
template<class U, class V> @\EXPLICIT@ constexpr pair(pair<U, V>&& p);
916914
template <class... Args1, class... Args2>
917-
pair(piecewise_construct_t,
918-
tuple<Args1...> first_args, tuple<Args2...> second_args);
915+
pair(piecewise_construct_t, tuple<Args1...> first_args, tuple<Args2...> second_args);
919916

920917
pair& operator=(const pair& p);
921918
template<class U, class V> pair& operator=(const pair<U, V>& p);
@@ -1048,8 +1045,7 @@
10481045
\indexlibrary{\idxcode{pair}!constructor}%
10491046
\begin{itemdecl}
10501047
template<class... Args1, class... Args2>
1051-
pair(piecewise_construct_t,
1052-
tuple<Args1...> first_args, tuple<Args2...> second_args);
1048+
pair(piecewise_construct_t, tuple<Args1...> first_args, tuple<Args2...> second_args);
10531049
\end{itemdecl}
10541050

10551051
\begin{itemdescr}
@@ -1279,13 +1275,10 @@
12791275
\pnum
12801276
\begin{example}
12811277
In place of:
1282-
12831278
\begin{codeblock}
12841279
return pair<int, double>(5, 3.1415926); // explicit types
12851280
\end{codeblock}
1286-
12871281
a \Cpp program may contain:
1288-
12891282
\begin{codeblock}
12901283
return make_pair(5, 3.1415926); // types are deduced
12911284
\end{codeblock}
@@ -1296,8 +1289,7 @@
12961289
\indexlibrary{\idxcode{tuple_size}}%
12971290
\begin{itemdecl}
12981291
template <class T1, class T2>
1299-
struct tuple_size<pair<T1, T2>>
1300-
: integral_constant<size_t, 2> { };
1292+
struct tuple_size<pair<T1, T2>> : integral_constant<size_t, 2> { };
13011293
\end{itemdecl}
13021294

13031295
\indexlibrary{\idxcode{tuple_element}}%
@@ -1446,12 +1438,13 @@
14461438

14471439
template <class... Types> class tuple_size<tuple<Types...>>;
14481440

1449-
template <size_t I, class T> class tuple_element; // not defined
1441+
template <size_t I, class T> class tuple_element; // not defined
14501442
template <size_t I, class T> class tuple_element<I, const T>;
14511443
template <size_t I, class T> class tuple_element<I, volatile T>;
14521444
template <size_t I, class T> class tuple_element<I, const volatile T>;
14531445

1454-
template <size_t I, class... Types> class tuple_element<I, tuple<Types...>>;
1446+
template <size_t I, class... Types>
1447+
class tuple_element<I, tuple<Types...>>;
14551448

14561449
template <size_t I, class T>
14571450
using tuple_element_t = typename tuple_element<I, T>::type;
@@ -1501,8 +1494,7 @@
15011494
void swap(tuple<Types...>& x, tuple<Types...>& y) noexcept(@\seebelow@);
15021495

15031496
// \ref{tuple.helper}, tuple helper classes
1504-
template <class T> constexpr size_t tuple_size_v
1505-
= tuple_size<T>::value;
1497+
template <class T> constexpr size_t tuple_size_v = tuple_size<T>::value;
15061498
}
15071499
\end{codeblock}
15081500

@@ -1514,7 +1506,6 @@
15141506
template <class... Types>
15151507
class tuple {
15161508
public:
1517-
15181509
// \ref{tuple.cnstr}, \tcode{tuple} construction
15191510
@\EXPLICIT@ constexpr tuple();
15201511
@\EXPLICIT@ constexpr tuple(const Types&...); // only if \tcode{sizeof...(Types) >= 1}
@@ -2190,8 +2181,7 @@
21902181
\indexlibrary{\idxcode{tuple_size}}%
21912182
\begin{itemdecl}
21922183
template <class... Types>
2193-
class tuple_size<tuple<Types...>>
2194-
: public integral_constant<size_t, sizeof...(Types)> { };
2184+
class tuple_size<tuple<Types...>> : public integral_constant<size_t, sizeof...(Types)> { };
21952185
\end{itemdecl}
21962186

21972187
\indexlibrary{\idxcode{tuple_element}}%
@@ -4887,8 +4877,7 @@
48874877
\indexlibrary{\idxcode{variant_size}}%
48884878
\begin{itemdecl}
48894879
template <class... Types>
4890-
struct variant_size<variant<Types...>>
4891-
: integral_constant<size_t, sizeof...(Types)> { };
4880+
struct variant_size<variant<Types...>> : integral_constant<size_t, sizeof...(Types)> { };
48924881
\end{itemdecl}
48934882
% No itemdescr needed for variant_size<variant<Types...>>
48944883

@@ -10521,10 +10510,8 @@
1052110510

1052210511
\pnum
1052310512
\begin{example}
10524-
1052510513
\begin{codeblock}
10526-
struct X: public enable_shared_from_this<X> {
10527-
};
10514+
struct X: public enable_shared_from_this<X> { };
1052810515

1052910516
int main() {
1053010517
shared_ptr<X> p(new X);

0 commit comments

Comments
 (0)