Skip to content

Commit 3b582e7

Browse files
jensmaurertkoeppe
authored andcommitted
[ios.base] Disambiguate names to distinguish parameters from static data members (#1969)
1 parent cba9d33 commit 3b582e7

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

source/iostreams.tex

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -814,16 +814,16 @@
814814

815815
// \ref{ios.base.storage}, storage
816816
static int xalloc();
817-
long& iword(int index);
818-
void*& pword(int index);
817+
long& iword(int idx);
818+
void*& pword(int idx);
819819

820820
// destructor
821821
virtual ~ios_base();
822822

823823
// \ref{ios.base.callback}, callbacks
824824
enum event { erase_event, imbue_event, copyfmt_event };
825-
using event_callback = void (*)(event, ios_base&, int index);
826-
void register_callback(event_callback fn, int index);
825+
using event_callback = void (*)(event, ios_base&, int idx);
826+
void register_callback(event_callback fn, int idx);
827827

828828
ios_base(const ios_base&) = delete;
829829
ios_base& operator=(const ios_base&) = delete;
@@ -1327,9 +1327,9 @@
13271327
\pnum
13281328
\effects
13291329
Calls each registered callback pair
1330-
\tcode{(fn, index)}\iref{ios.base.callback}
1330+
\tcode{(fn, idx)}\iref{ios.base.callback}
13311331
as
1332-
\tcode{(*fn)(imbue_event, *this, index)}
1332+
\tcode{(*fn)(imbue_event, *this, idx)}
13331333
at such a time that a call to
13341334
\tcode{ios_base::getloc()}
13351335
from within
@@ -1542,14 +1542,14 @@
15421542

15431543
\indexlibrarymember{register_callback}{ios_base}%
15441544
\begin{itemdecl}
1545-
void register_callback(event_callback fn, int index);
1545+
void register_callback(event_callback fn, int idx);
15461546
\end{itemdecl}
15471547

15481548
\begin{itemdescr}
15491549
\pnum
15501550
\effects
15511551
Registers the pair
1552-
\tcode{(fn, index)}
1552+
\tcode{(fn, idx)}
15531553
such that during calls to
15541554
\tcode{imbue()}\iref{ios.base.locales},
15551555
\tcode{copyfmt()},
@@ -1558,7 +1558,7 @@
15581558
the function
15591559
\tcode{fn}
15601560
is called with argument
1561-
\tcode{index}.
1561+
\tcode{idx}.
15621562
Functions registered are called when an event occurs, in opposite order of
15631563
registration.
15641564
Functions registered while a callback function is active are not called until the next event.
@@ -1605,8 +1605,8 @@
16051605
Destroys an object of class
16061606
\tcode{ios_base}.
16071607
Calls each registered callback pair
1608-
\tcode{(fn, index)}\iref{ios.base.callback} as
1609-
\tcode{(*fn)(\brk{}erase_event, *this, index)}
1608+
\tcode{(fn, idx)}\iref{ios.base.callback} as
1609+
\tcode{(*fn)(\brk{}erase_event, *this, idx)}
16101610
at such time that any
16111611
\tcode{ios_base}
16121612
member function called from within
@@ -2063,8 +2063,8 @@
20632063
the corresponding member objects of \tcode{rhs} as follows:
20642064

20652065
\begin{itemize}
2066-
\item calls each registered callback pair \tcode{(fn, index)} as
2067-
\tcode{(*fn)(erase_event, *this, index)};
2066+
\item calls each registered callback pair \tcode{(fn, idx)} as
2067+
\tcode{(*fn)(erase_event, *this, idx)};
20682068

20692069
\item then, assigns to the member objects of \tcode{*this} the corresponding member objects of
20702070
\tcode{rhs}, except that
@@ -2084,7 +2084,7 @@
20842084
\end{itemize}
20852085

20862086
\item then, calls each callback pair that was copied from \tcode{rhs} as
2087-
\tcode{(*fn)(copyfmt_event, *this, index)};
2087+
\tcode{(*fn)(copyfmt_event, *this, idx)};
20882088

20892089
\item then, calls \tcode{exceptions(rhs.exceptions())}.
20902090

0 commit comments

Comments
 (0)