Skip to content

Commit c63e5e8

Browse files
jensmaurertkoeppe
authored andcommitted
[input.output] Fix headings of 'assign and swap' subclauses
1 parent 26f6a1f commit c63e5e8

File tree

2 files changed

+42
-29
lines changed

2 files changed

+42
-29
lines changed

source/iostreams.tex

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4291,7 +4291,7 @@
42914291
basic_istream(const basic_istream&) = delete;
42924292
basic_istream(basic_istream&& rhs);
42934293

4294-
// \ref{istream.assign}, assign and swap
4294+
// \ref{istream.assign}, assignment and swap
42954295
basic_istream& operator=(const basic_istream&) = delete;
42964296
basic_istream& operator=(basic_istream&& rhs);
42974297
void swap(basic_istream& rhs);
@@ -5714,7 +5714,7 @@
57145714
basic_iostream(const basic_iostream&) = delete;
57155715
basic_iostream(basic_iostream&& rhs);
57165716

5717-
// \ref{iostream.assign}, assign and swap
5717+
// \ref{iostream.assign}, assignment and swap
57185718
basic_iostream& operator=(const basic_iostream&) = delete;
57195719
basic_iostream& operator=(basic_iostream&& rhs);
57205720
void swap(basic_iostream& rhs);
@@ -5874,7 +5874,7 @@
58745874
basic_ostream(const basic_ostream&) = delete;
58755875
basic_ostream(basic_ostream&& rhs);
58765876

5877-
// \ref{ostream.assign}, assign and swap
5877+
// \ref{ostream.assign}, assignment and swap
58785878
basic_ostream& operator=(const basic_ostream&) = delete;
58795879
basic_ostream& operator=(basic_ostream&& rhs);
58805880
void swap(basic_ostream& rhs);
@@ -7587,7 +7587,7 @@
75877587
basic_stringbuf(basic_stringbuf&& rhs);
75887588
basic_stringbuf(basic_stringbuf&& rhs, const Allocator& a);
75897589

7590-
// \ref{stringbuf.assign}, assign and swap
7590+
// \ref{stringbuf.assign}, assignment and swap
75917591
basic_stringbuf& operator=(const basic_stringbuf&) = delete;
75927592
basic_stringbuf& operator=(basic_stringbuf&& rhs);
75937593
void swap(basic_stringbuf& rhs) noexcept(@\seebelow@);
@@ -8383,9 +8383,10 @@
83838383
basic_istringstream(const basic_istringstream&) = delete;
83848384
basic_istringstream(basic_istringstream&& rhs);
83858385

8386-
// \ref{istringstream.assign}, assign and swap
83878386
basic_istringstream& operator=(const basic_istringstream&) = delete;
83888387
basic_istringstream& operator=(basic_istringstream&& rhs);
8388+
8389+
// \ref{istringstream.swap}, swap
83898390
void swap(basic_istringstream& rhs);
83908391

83918392
// \ref{istringstream.members}, members
@@ -8532,7 +8533,7 @@
85328533
to install the contained \tcode{basic_stringbuf}.
85338534
\end{itemdescr}
85348535

8535-
\rSec3[istringstream.assign]{Assignment and swap}
8536+
\rSec3[istringstream.swap]{Swap}
85368537

85378538
\indexlibrarymember{swap}{basic_istringstream}%
85388539
\begin{itemdecl}
@@ -8697,9 +8698,10 @@
86978698
basic_ostringstream(const basic_ostringstream&) = delete;
86988699
basic_ostringstream(basic_ostringstream&& rhs);
86998700

8700-
// \ref{ostringstream.assign}, assign and swap
87018701
basic_ostringstream& operator=(const basic_ostringstream&) = delete;
87028702
basic_ostringstream& operator=(basic_ostringstream&& rhs);
8703+
8704+
// \ref{ostringstream.swap}, swap
87038705
void swap(basic_ostringstream& rhs);
87048706

87058707
// \ref{ostringstream.members}, members
@@ -8851,7 +8853,7 @@
88518853
to install the contained \tcode{basic_stringbuf}.
88528854
\end{itemdescr}
88538855

8854-
\rSec3[ostringstream.assign]{Assignment and swap}
8856+
\rSec3[ostringstream.swap]{Swap}
88558857

88568858
\indexlibrarymember{swap}{basic_ostringstream}%
88578859
\begin{itemdecl}
@@ -9016,9 +9018,10 @@
90169018
basic_stringstream(const basic_stringstream&) = delete;
90179019
basic_stringstream(basic_stringstream&& rhs);
90189020

9019-
// \ref{stringstream.assign}, assign and swap
90209021
basic_stringstream& operator=(const basic_stringstream&) = delete;
90219022
basic_stringstream& operator=(basic_stringstream&& rhs);
9023+
9024+
// \ref{stringstream.swap}, swap
90229025
void swap(basic_stringstream& rhs);
90239026

90249027
// \ref{stringstream.members}, members
@@ -9175,7 +9178,7 @@
91759178
to install the contained \tcode{basic_stringbuf}.
91769179
\end{itemdescr}
91779180

9178-
\rSec3[stringstream.assign]{Assignment and swap}
9181+
\rSec3[stringstream.swap]{Swap}
91799182

91809183
\indexlibrarymember{swap}{basic_stringstream}%
91819184
\begin{itemdecl}
@@ -9707,9 +9710,10 @@
97079710
basic_ispanstream(basic_ispanstream&& rhs);
97089711
template<class ROS> explicit basic_ispanstream(ROS&& s);
97099712

9710-
// \ref{ispanstream.assign}, assignment and swap
97119713
basic_ispanstream& operator=(const basic_ispanstream&) = delete;
97129714
basic_ispanstream& operator=(basic_ispanstream&& rhs);
9715+
9716+
// \ref{ispanstream.swap}, swap
97139717
void swap(basic_ispanstream& rhs);
97149718

97159719
// \ref{ispanstream.members}, member functions
@@ -9786,7 +9790,7 @@
97869790
\end{codeblock}
97879791
\end{itemdescr}
97889792

9789-
\rSec3[ispanstream.assign]{Assignment and swap}
9793+
\rSec3[ispanstream.swap]{Swap}
97909794

97919795
\indexlibrarymember{swap}{basic_ispanstream}%
97929796
\begin{itemdecl}
@@ -9896,9 +9900,10 @@
98969900
basic_ospanstream(const basic_ospanstream&) = delete;
98979901
basic_ospanstream(basic_ospanstream&& rhs);
98989902

9899-
// \ref{ospanstream.assign}, assignment and swap
99009903
basic_ospanstream& operator=(const basic_ospanstream&) = delete;
99019904
basic_ospanstream& operator=(basic_ospanstream&& rhs);
9905+
9906+
// \ref{ospanstream.swap}, swap
99029907
void swap(basic_ospanstream& rhs);
99039908

99049909
// \ref{ospanstream.members}, member functions
@@ -9946,7 +9951,7 @@
99469951
is called to install the contained \tcode{basic_spanbuf}.
99479952
\end{itemdescr}
99489953

9949-
\rSec3[ospanstream.assign]{Assignment and swap}
9954+
\rSec3[ospanstream.swap]{Swap}
99509955

99519956
\indexlibrarymember{swap}{basic_ospanstream}%
99529957
\begin{itemdecl}
@@ -10036,9 +10041,10 @@
1003610041
basic_spanstream(const basic_spanstream&) = delete;
1003710042
basic_spanstream(basic_spanstream&& rhs);
1003810043

10039-
// \ref{spanstream.assign}, assignment and swap
1004010044
basic_spanstream& operator=(const basic_spanstream&) = delete;
1004110045
basic_spanstream& operator=(basic_spanstream&& rhs);
10046+
10047+
// \ref{spanstream.swap}, swap
1004210048
void swap(basic_spanstream& rhs);
1004310049

1004410050
// \ref{spanstream.members}, members
@@ -10086,7 +10092,7 @@
1008610092
is called to install the contained \tcode{basic_spanbuf}.
1008710093
\end{itemdescr}
1008810094

10089-
\rSec3[spanstream.assign]{Assignment and swap}
10095+
\rSec3[spanstream.swap]{Swap}
1009010096

1009110097
\indexlibrarymember{swap}{basic_spanstream}%
1009210098
\begin{itemdecl}
@@ -10257,7 +10263,7 @@
1025710263
basic_filebuf(basic_filebuf&& rhs);
1025810264
virtual ~basic_filebuf();
1025910265

10260-
// \ref{filebuf.assign}, assign and swap
10266+
// \ref{filebuf.assign}, assignment and swap
1026110267
basic_filebuf& operator=(const basic_filebuf&) = delete;
1026210268
basic_filebuf& operator=(basic_filebuf&& rhs);
1026310269
void swap(basic_filebuf& rhs);
@@ -10447,8 +10453,7 @@
1044710453
\indexlibrarymember{swap}{basic_filebuf}%
1044810454
\begin{itemdecl}
1044910455
template<class charT, class traits>
10450-
void swap(basic_filebuf<charT, traits>& x,
10451-
basic_filebuf<charT, traits>& y);
10456+
void swap(basic_filebuf<charT, traits>& x, basic_filebuf<charT, traits>& y);
1045210457
\end{itemdecl}
1045310458

1045410459
\begin{itemdescr}
@@ -11031,9 +11036,10 @@
1103111036
basic_ifstream(const basic_ifstream&) = delete;
1103211037
basic_ifstream(basic_ifstream&& rhs);
1103311038

11034-
// \ref{ifstream.assign}, assign and swap
1103511039
basic_ifstream& operator=(const basic_ifstream&) = delete;
1103611040
basic_ifstream& operator=(basic_ifstream&& rhs);
11041+
11042+
// \ref{ifstream.swap}, swap
1103711043
void swap(basic_ifstream& rhs);
1103811044

1103911045
// \ref{ifstream.members}, members
@@ -11144,7 +11150,7 @@
1114411150
to install the contained \tcode{basic_filebuf}.
1114511151
\end{itemdescr}
1114611152

11147-
\rSec3[ifstream.assign]{Assignment and swap}
11153+
\rSec3[ifstream.swap]{Swap}
1114811154

1114911155
\indexlibrarymember{swap}{basic_ifstream}%
1115011156
\begin{itemdecl}
@@ -11163,8 +11169,7 @@
1116311169
\indexlibrarymember{swap}{basic_ifstream}%
1116411170
\begin{itemdecl}
1116511171
template<class charT, class traits>
11166-
void swap(basic_ifstream<charT, traits>& x,
11167-
basic_ifstream<charT, traits>& y);
11172+
void swap(basic_ifstream<charT, traits>& x, basic_ifstream<charT, traits>& y);
1116811173
\end{itemdecl}
1116911174

1117011175
\begin{itemdescr}
@@ -11276,9 +11281,10 @@
1127611281
basic_ofstream(const basic_ofstream&) = delete;
1127711282
basic_ofstream(basic_ofstream&& rhs);
1127811283

11279-
// \ref{ofstream.assign}, assign and swap
1128011284
basic_ofstream& operator=(const basic_ofstream&) = delete;
1128111285
basic_ofstream& operator=(basic_ofstream&& rhs);
11286+
11287+
// \ref{ofstream.swap}, swap
1128211288
void swap(basic_ofstream& rhs);
1128311289

1128411290
// \ref{ofstream.members}, members
@@ -11389,7 +11395,7 @@
1138911395
to install the contained \tcode{basic_filebuf}.
1139011396
\end{itemdescr}
1139111397

11392-
\rSec3[ofstream.assign]{Assignment and swap}
11398+
\rSec3[ofstream.swap]{Swap}
1139311399

1139411400
\indexlibrarymember{swap}{basic_ofstream}%
1139511401
\begin{itemdecl}
@@ -11408,8 +11414,7 @@
1140811414
\indexlibrarymember{swap}{basic_ofstream}%
1140911415
\begin{itemdecl}
1141011416
template<class charT, class traits>
11411-
void swap(basic_ofstream<charT, traits>& x,
11412-
basic_ofstream<charT, traits>& y);
11417+
void swap(basic_ofstream<charT, traits>& x, basic_ofstream<charT, traits>& y);
1141311418
\end{itemdecl}
1141411419

1141511420
\begin{itemdescr}
@@ -11522,9 +11527,10 @@
1152211527
basic_fstream(const basic_fstream&) = delete;
1152311528
basic_fstream(basic_fstream&& rhs);
1152411529

11525-
// \ref{fstream.assign}, assign and swap
1152611530
basic_fstream& operator=(const basic_fstream&) = delete;
1152711531
basic_fstream& operator=(basic_fstream&& rhs);
11532+
11533+
// \ref{fstream.swap}, swap
1152811534
void swap(basic_fstream& rhs);
1152911535

1153011536
// \ref{fstream.members}, members
@@ -11645,7 +11651,7 @@
1164511651
to install the contained \tcode{basic_filebuf}.
1164611652
\end{itemdescr}
1164711653

11648-
\rSec3[fstream.assign]{Assignment and swap}
11654+
\rSec3[fstream.swap]{Swap}
1164911655

1165011656
\indexlibrarymember{swap}{basic_fstream}%
1165111657
\begin{itemdecl}

source/xrefdelta.tex

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,12 @@
8282
\movedxref{depr.stdbool.h.syn}{stdbool.h.syn}
8383
\movedxref{depr.tgmath.h.syn}{tgmath.h.syn}
8484

85+
\movedxref{istringstream.assign}{istringstream.swap}
86+
\movedxref{ostringstream.assign}{ostringstream.swap}
87+
\movedxref{stringstream.assign}{stringstream.swap}
88+
\movedxref{ifstream.assign}{ifstream.swap}
89+
\movedxref{ofstream.assign}{ofstream.swap}
90+
\movedxref{fstream.assign}{fstream.swap}
91+
8592
% Deprecated features.
8693
%\deprxref{old.label} (if moved to depr.old.label, otherwise use \movedxref)

0 commit comments

Comments
 (0)