Skip to content

Commit 07901a9

Browse files
jensmaurerzygoloid
authored andcommitted
[input.output] Avoid colons in stable labels
1 parent 6e5dba3 commit 07901a9

File tree

3 files changed

+29
-20
lines changed

3 files changed

+29
-20
lines changed

source/compatibility.tex

+2-2
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@
12781278

12791279
\rSec2[diff.cpp03.input.output]{\ref{input.output}: input/output library}
12801280

1281-
\diffrefs{istream::sentry}{ostream::sentry}, \ref{iostate.flags}
1281+
\diffrefs{istream.sentry}{ostream.sentry}, \ref{iostate.flags}
12821282
\change Specify use of \tcode{explicit} in existing boolean conversion functions.
12831283
\rationale Clarify intentions, avoid workarounds.
12841284
\effect
@@ -1294,7 +1294,7 @@
12941294
\item initializing a \tcode{const bool\&} which would bind to a temporary object.
12951295
\end{itemize}
12961296

1297-
\diffref{ios::failure}
1297+
\diffref{ios.failure}
12981298
\change Change base class of \tcode{std::ios_base::failure}.
12991299
\rationale More detailed error messages.
13001300
\effect

source/iostreams.tex

+18-18
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@
748748
public:
749749
class failure; // see below
750750

751-
// \ref{ios::fmtflags}, \tcode{fmtflags}
751+
// \ref{ios.fmtflags}, \tcode{fmtflags}
752752
using fmtflags = @\textit{T1}@;
753753
static constexpr fmtflags boolalpha = @\unspec@;
754754
static constexpr fmtflags dec = @\unspec@;
@@ -769,14 +769,14 @@
769769
static constexpr fmtflags basefield = @\seebelow@;
770770
static constexpr fmtflags floatfield = @\seebelow@;
771771

772-
// \ref{ios::iostate}, \tcode{iostate}
772+
// \ref{ios.iostate}, \tcode{iostate}
773773
using iostate = @\textit{T2}@;
774774
static constexpr iostate badbit = @\unspec@;
775775
static constexpr iostate eofbit = @\unspec@;
776776
static constexpr iostate failbit = @\unspec@;
777777
static constexpr iostate goodbit = @\seebelow@;
778778

779-
// \ref{ios::openmode}, \tcode{openmode}
779+
// \ref{ios.openmode}, \tcode{openmode}
780780
using openmode = @\textit{T3}@;
781781
static constexpr openmode app = @\unspec@;
782782
static constexpr openmode ate = @\unspec@;
@@ -785,7 +785,7 @@
785785
static constexpr openmode out = @\unspec@;
786786
static constexpr openmode trunc = @\unspec@;
787787

788-
// \ref{ios::seekdir}, \tcode{seekdir}
788+
// \ref{ios.seekdir}, \tcode{seekdir}
789789
using seekdir = @\textit{T4}@;
790790
static constexpr seekdir beg = @\unspec@;
791791
static constexpr seekdir cur = @\unspec@;
@@ -889,7 +889,7 @@
889889

890890
\rSec3[ios.types]{Types}
891891

892-
\rSec4[ios::failure]{Class \tcode{ios_base::failure}}
892+
\rSec4[ios.failure]{Class \tcode{ios_base::failure}}
893893

894894
\indexlibrary{\idxcode{ios_base::failure}}%
895895
\indexlibrary{\idxcode{ios_base}!\idxcode{failure}}%
@@ -952,7 +952,7 @@
952952
\tcode{failure} by constructing the base class with \tcode{msg} and \tcode{ec}.
953953
\end{itemdescr}
954954

955-
\rSec4[ios::fmtflags]{Type \tcode{ios_base::fmtflags}}
955+
\rSec4[ios.fmtflags]{Type \tcode{ios_base::fmtflags}}
956956

957957
\indexlibrarymember{fmtflags}{ios_base}%
958958
\begin{itemdecl}
@@ -1015,7 +1015,7 @@
10151015
\end{floattable}
10161016
\end{itemdescr}
10171017

1018-
\rSec4[ios::iostate]{Type \tcode{ios_base::iostate}}
1018+
\rSec4[ios.iostate]{Type \tcode{ios_base::iostate}}
10191019

10201020
\indexlibrarymember{iostate}{ios_base}%
10211021
\begin{itemdecl}
@@ -1051,7 +1051,7 @@
10511051
\end{itemize}
10521052
\end{itemdescr}
10531053

1054-
\rSec4[ios::openmode]{Type \tcode{ios_base::openmode}}
1054+
\rSec4[ios.openmode]{Type \tcode{ios_base::openmode}}
10551055

10561056
\indexlibrarymember{openmode}{ios_base}%
10571057
\begin{itemdecl}
@@ -1081,7 +1081,7 @@
10811081
\end{libefftab}
10821082
\end{itemdescr}
10831083

1084-
\rSec4[ios::seekdir]{Type \tcode{ios_base::seekdir}}
1084+
\rSec4[ios.seekdir]{Type \tcode{ios_base::seekdir}}
10851085

10861086
\indexlibrarymember{seekdir}{ios_base}%
10871087
\begin{itemdecl}
@@ -1105,7 +1105,7 @@
11051105
\end{libefftabmean}
11061106
\end{itemdescr}
11071107

1108-
\rSec4[ios::Init]{Class \tcode{ios_base::Init}}
1108+
\rSec4[ios.init]{Class \tcode{ios_base::Init}}
11091109

11101110
\indexlibrary{\idxcode{ios_base::Init}}%
11111111
\indexlibrary{\idxcode{ios_base}!\idxcode{Init}}%
@@ -2256,7 +2256,7 @@
22562256
If \tcode{((state | (rdbuf() ? goodbit : badbit)) \& exceptions()) == 0},
22572257
returns.
22582258
Otherwise, the function throws an object of class
2259-
\tcode{basic_ios::failure}\iref{ios::failure},
2259+
\tcode{basic_ios::failure}\iref{ios.failure},
22602260
constructed with
22612261
\impldef{argument values to construct \tcode{basic_ios::failure}}
22622262
argument values.%
@@ -2273,7 +2273,7 @@
22732273
Calls
22742274
\tcode{clear(rdstate() | state)}
22752275
(which may throw
2276-
\tcode{basic_ios::failure}\iref{ios::failure}).
2276+
\tcode{basic_ios::failure}\iref{ios.failure}).
22772277
\end{itemdescr}
22782278

22792279
\indexlibrarymember{good}{basic_ios}%
@@ -4206,7 +4206,7 @@
42064206
explicit basic_istream(basic_streambuf<charT, traits>* sb);
42074207
virtual ~basic_istream();
42084208

4209-
// \ref{istream::sentry}, prefix/suffix
4209+
// \ref{istream.sentry}, prefix/suffix
42104210
class sentry;
42114211

42124212
// \ref{istream.formatted}, formatted input
@@ -4417,7 +4417,7 @@
44174417
\tcode{rhs.gcount()}.
44184418
\end{itemdescr}
44194419

4420-
\rSec4[istream::sentry]{Class \tcode{basic_istream::sentry}}
4420+
\rSec4[istream.sentry]{Class \tcode{basic_istream::sentry}}
44214421

44224422
\indexlibrary{\idxcode{basic_istream::sentry}}%
44234423
\indexlibrary{\idxcode{sentry}!\idxcode{basic_istream}}%
@@ -5587,7 +5587,7 @@
55875587
constructing a sentry object extracts characters as long as the next available
55885588
character \tcode{c} is whitespace or until there are no more characters in the sequence.
55895589
Whitespace characters are distinguished with the same criterion as used by
5590-
\tcode{sentry::sentry}\iref{istream::sentry}.
5590+
\tcode{sentry::sentry}\iref{istream.sentry}.
55915591
If
55925592
\tcode{ws}
55935593
stops extracting characters because there are no more available it sets
@@ -5767,7 +5767,7 @@
57675767
explicit basic_ostream(basic_streambuf<char_type, traits>* sb);
57685768
virtual ~basic_ostream();
57695769

5770-
// \ref{ostream::sentry}, prefix/suffix
5770+
// \ref{ostream.sentry}, prefix/suffix
57715771
class sentry;
57725772

57735773
// \ref{ostream.formatted}, formatted output
@@ -5963,7 +5963,7 @@
59635963
\effects Calls \tcode{basic_ios<charT, traits>::swap(rhs)}.
59645964
\end{itemdescr}
59655965

5966-
\rSec4[ostream::sentry]{Class \tcode{basic_ostream::sentry}}
5966+
\rSec4[ostream.sentry]{Class \tcode{basic_ostream::sentry}}
59675967

59685968
\indexlibrary{\idxcode{basic_ostream::sentry}}%
59695969
\indexlibrary{\idxcode{sentry}!\idxcode{basic_ostream}}%
@@ -7271,7 +7271,7 @@
72717271
\tcode{in >> quoted(s, delim, escape)} behaves as if it extracts the following
72727272
characters from \tcode{in} using
72737273
\tcode{operator>>(basic_istream<charT, traits>\&, charT\&)}\iref{istream.extractors}
7274-
which may throw \tcode{ios_base::failure}\iref{ios::failure}:
7274+
which may throw \tcode{ios_base::failure}\iref{ios.failure}:
72757275
\begin{itemize}
72767276
\item If the first character extracted is equal to \tcode{delim}, as
72777277
determined by \tcode{traits_type::eq}, then:

source/xrefdelta.tex

+9
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,15 @@
185185
\movedxref{string.op<=}{string.cmp}
186186
\movedxref{string.op>=}{string.cmp}
187187

188+
\movedxref{istream::sentry}{istream.sentry}
189+
\movedxref{ostream::sentry}{ostream.sentry}
190+
\movedxref{ios::failure}{ios.failure}
191+
\movedxref{ios::fmtflatgs}{ios.fmtflags}
192+
\movedxref{ios::iostate}{ios.iostate}
193+
\movedxref{ios::openmode}{ios.openmode}
194+
\movedxref{ios::seekdir}{ios.seekdir}
195+
\movedxref{ios::Init}{ios.init}
196+
188197
% Deprecated features.
189198
%\deprxref{old.label} (if moved to depr.old.label, otherwise use \movedxref)
190199

0 commit comments

Comments
 (0)