Skip to content

Commit 8f8a40f

Browse files
committed
[bind] Delete the essentially-empty [bind] subclause and move its only
contents, [func.bind], up a level. This removes the existing 20.9.9 and renames 20.9.9.1 to 20.9.9. [bind] used to group together other binders, but those are now in [depr]. Fixes #284.
1 parent 25aa6a5 commit 8f8a40f

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

source/future.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,7 @@
15981598
The binders \tcode{binder1st}, \tcode{bind1st},
15991599
\tcode{binder2nd}, and \tcode{bind2nd} are deprecated.
16001600
\enternote The function template
1601-
\tcode{bind}~(\ref{bind}) provides a better
1601+
\tcode{bind}~(\ref{func.bind.bind}) provides a better
16021602
solution.\exitnote
16031603

16041604
\rSec2[depr.lib.binder.1st]{Class template \tcode{binder1st}}

source/utilities.tex

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7041,7 +7041,7 @@
70417041
template <class Predicate>
70427042
constexpr binary_negate<Predicate> not2(const Predicate&);
70437043

7044-
// \ref{bind}, bind:
7044+
// \ref{func.bind}, bind:
70457045
template<class T> struct is_bind_expression;
70467046
template<class T> struct is_placeholder;
70477047

@@ -8191,20 +8191,14 @@
81918191
\tcode{binary_negate<Predicate>(pred)}.
81928192
\end{itemdescr}
81938193

8194-
\rSec2[bind]{Function template \tcode{bind}}
8195-
8196-
\pnum
8197-
The function template \tcode{bind} returns an object that binds a
8198-
callable object passed as an argument to additional arguments.
8199-
8200-
\rSec3[func.bind]{Function object binders}%
8194+
\rSec2[func.bind]{Function object binders}%
82018195
\indextext{function object!binders|(}
82028196

82038197
\pnum
82048198
This subclause describes a uniform mechanism for binding
82058199
arguments of callable objects.
82068200

8207-
\rSec4[func.bind.isbind]{Class template \tcode{is_bind_expression}}
8201+
\rSec3[func.bind.isbind]{Class template \tcode{is_bind_expression}}
82088202

82098203
\indexlibrary{\idxcode{is_bind_expression}}%
82108204
\begin{codeblock}
@@ -8228,7 +8222,7 @@
82288222
to have a BaseCharacteristic of \tcode{true_type} to indicate that
82298223
\tcode{T} should be treated as a subexpression in a \tcode{bind} call.
82308224

8231-
\rSec4[func.bind.isplace]{Class template \tcode{is_placeholder}}
8225+
\rSec3[func.bind.isplace]{Class template \tcode{is_placeholder}}
82328226

82338227
\indexlibrary{\idxcode{is_placeholder}}%
82348228
\begin{codeblock}
@@ -8254,7 +8248,7 @@
82548248
with \tcode{\textit{N} > 0} to indicate that \tcode{T} should be
82558249
treated as a placeholder type.
82568250

8257-
\rSec4[func.bind.bind]{Function template \tcode{bind}}
8251+
\rSec3[func.bind.bind]{Function template \tcode{bind}}
82588252
\indexlibrary{\idxcode{bind}|(}
82598253

82608254
\pnum
@@ -8373,7 +8367,7 @@
83738367
is \tcode{TiD \textit{cv} \&}.
83748368
\end{itemize}
83758369

8376-
\rSec4[func.bind.place]{Placeholders}
8370+
\rSec3[func.bind.place]{Placeholders}
83778371

83788372
\indexlibrary{\idxcode{placeholders}}%
83798373
\indexlibrary{1@\tcode{_1}}%

source/xref.tex

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
basic.types\quad\ref{basic.types}\\
179179
bidirectional.iterators\quad\ref{bidirectional.iterators}\\
180180
binary.search\quad\ref{binary.search}\\
181-
bind\quad\ref{bind}\\
182181
bitmask.types\quad\ref{bitmask.types}\\
183182
bitset.cons\quad\ref{bitset.cons}\\
184183
bitset.hash\quad\ref{bitset.hash}\\

0 commit comments

Comments
 (0)