Skip to content

Use 'subclause', not 'section'. #1585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions source/algorithms.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@
\pnum
If an algorithm's
\effects
section says that a value pointed to by any iterator passed
element specifies that a value pointed to by any iterator passed
as an argument is modified, then that algorithm has an additional
type requirement:
The type of that argument shall satisfy the requirements
Expand Down Expand Up @@ -1226,7 +1226,7 @@
\rSec1[algorithms.parallel]{Parallel algorithms}

\pnum
This section describes components that \Cpp programs may use to perform
This subclause describes components that \Cpp programs may use to perform
operations on containers and other sequences in parallel.

\rSec2[algorithms.parallel.defns]{Terms and definitions}
Expand Down Expand Up @@ -3937,7 +3937,7 @@
\rSec2[alg.binary.search]{Binary search}

\pnum
All of the algorithms in this section are versions of binary search
All of the algorithms in this subclause are versions of binary search
and assume that the sequence being searched is partitioned with respect to
an expression formed by binding the search key to an argument of the
implied or explicit comparison function.
Expand Down Expand Up @@ -4496,7 +4496,7 @@
\rSec2[alg.set.operations]{Set operations on sorted structures}

\pnum
This section defines all the basic set operations on sorted structures.
This subclause defines all the basic set operations on sorted structures.
They also work with
\tcode{multiset}s\iref{multiset}
containing multiple copies of equivalent elements.
Expand Down
2 changes: 1 addition & 1 deletion source/atomics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@
\rSec1[atomics.fences]{Fences}

\pnum
This section introduces synchronization primitives called \term{fences}. Fences can have
This subclause introduces synchronization primitives called \term{fences}. Fences can have
acquire semantics, release semantics, or both. A fence with acquire semantics is called
an \term{acquire fence}. A fence with release semantics is called a \term{release
fence}.
Expand Down
8 changes: 4 additions & 4 deletions source/back.tex
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ \chapter{Bibliography}

\clearpage
\renewcommand{\glossaryname}{Cross references}
\renewcommand{\preglossaryhook}{This annex lists each section label and the
corresponding section number and page number, in alphabetical order by label.\\}
\renewcommand{\preglossaryhook}{This annex lists each clause or subclause label and the
corresponding clause or subclause number and page number, in alphabetical order by label.\\}
\twocolglossary
\renewcommand{\leftmark}{\glossaryname}
{
Expand All @@ -37,7 +37,7 @@ \chapter{Bibliography}
\clearpage
\input{xrefdelta}
\renewcommand{\glossaryname}{Cross references from ISO \CppXVII}
\renewcommand{\preglossaryhook}{All section labels from
\renewcommand{\preglossaryhook}{All clause and subclause labels from
ISO \CppXVII (ISO/IEC 14882:2017, \doccite{Programming Languages --- \Cpp})
are present in this document, with the exceptions described below.\\}
\renewcommand{\leftmark}{\glossaryname}
Expand Down Expand Up @@ -74,7 +74,7 @@ \chapter{Bibliography}
}

\clearpage
\renewcommand{\preindexhook}{The entries in this section are rough descriptions; exact
\renewcommand{\preindexhook}{The entries in this index are rough descriptions; exact
specifications are at the indicated page in the general text.\\}
\renewcommand{\indexname}{Index of implementation-defined behavior}
\renewcommand{\leftmark}{\indexname}
Expand Down
10 changes: 5 additions & 5 deletions source/basic.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2947,7 +2947,7 @@
\end{example}

\pnum
In this section, ``before'' and ``after'' refer to the ``happens before''
In this subclause, ``before'' and ``after'' refer to the ``happens before''
relation\iref{intro.multithread}. \begin{note} Therefore, undefined behavior results
if an object that is being constructed in one thread is referenced from another
thread without adequate synchronization. \end{note}%
Expand Down Expand Up @@ -3286,7 +3286,7 @@
\item the value returned by a call to the \Cpp standard library implementation of
\tcode{::operator new(std::\brk{}size_t)} or
\tcode{::operator new(std::size_t, std::align_val_t)}%
;\footnote{This section does not impose restrictions
;\footnote{This subclause does not impose restrictions
on indirection through pointers to memory not allocated by \tcode{::operator new}. This
maintains the ability of many \Cpp implementations to use binary libraries and
components written in other languages. In particular, this applies to C binaries,
Expand Down Expand Up @@ -3771,7 +3771,7 @@
unsigned integer types are collectively called the
\defnx{extended integer types}{extended integer type}.
The signed and unsigned integer types shall satisfy
the constraints given in the C standard, section 5.2.4.2.1.
the constraints given in the C standard, subclause 5.2.4.2.1.

\pnum
\indextext{arithmetic!\idxcode{unsigned}}%
Expand Down Expand Up @@ -4410,7 +4410,7 @@
and they are not potentially concurrent\iref{intro.multithread},
the behavior is undefined.
\begin{note}
The next section imposes similar, but more complex restrictions on
The next subclause imposes similar, but more complex restrictions on
potentially concurrent computations.
\end{note}

Expand Down Expand Up @@ -4509,7 +4509,7 @@
initial value of the object, a value assigned to the object by \placeholder{T}, or a
value assigned to the object by another thread, according to the rules below.
\begin{note} In some cases, there may instead be undefined behavior. Much of this
section is motivated by the desire to support atomic operations with explicit
subclause is motivated by the desire to support atomic operations with explicit
and detailed visibility constraints. However, it also implicitly supports a
simpler view for more restricted programs. \end{note}

Expand Down
8 changes: 4 additions & 4 deletions source/containers.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7502,7 +7502,7 @@
An \tcode{unordered_map} satisfies all of the requirements of a container, of an unordered associative container, and of an allocator-aware container (Table~\ref{tab:containers.allocatoraware}). It provides the operations described in the preceding requirements table for unique keys; that is, an \tcode{unordered_map} supports the \tcode{a_uniq} operations in that table, not the \tcode{a_eq} operations. For an \tcode{unordered_map<Key, T>} the \tcode{key type} is \tcode{Key}, the mapped type is \tcode{T}, and the value type is \tcode{pair<const Key, T>}.

\pnum
This section only describes operations on \tcode{unordered_map} that
This subclause only describes operations on \tcode{unordered_map} that
are not described in one of the requirement tables, or for which there
is additional semantic information.

Expand Down Expand Up @@ -8062,7 +8062,7 @@
mapped type is \tcode{T}, and the value type is \tcode{pair<const Key, T>}.

\pnum
This section only describes operations on \tcode{unordered_multimap}
This subclause only describes operations on \tcode{unordered_multimap}
that are not described in one of the requirement tables, or for which
there is additional semantic information.

Expand Down Expand Up @@ -8406,7 +8406,7 @@
An \tcode{unordered_set} satisfies all of the requirements of a container, of an unordered associative container, and of an allocator-aware container (Table~\ref{tab:containers.allocatoraware}). It provides the operations described in the preceding requirements table for unique keys; that is, an \tcode{unordered_set} supports the \tcode{a_uniq} operations in that table, not the \tcode{a_eq} operations. For an \tcode{unordered_set<Key>} the \tcode{key type} and the value type are both \tcode{Key}. The \tcode{iterator} and \tcode{const_iterator} types are both constant iterator types. It is unspecified whether they are the same type.

\pnum
This section only describes operations on \tcode{unordered_set} that
This subclause only describes operations on \tcode{unordered_set} that
are not described in one of the requirement tables, or for which there
is additional semantic information.

Expand Down Expand Up @@ -8709,7 +8709,7 @@
constant iterator types. It is unspecified whether they are the same type.

\pnum
This section only describes operations on \tcode{unordered_multiset} that
This subclause only describes operations on \tcode{unordered_multiset} that
are not described in one of the requirement tables, or for which there
is additional semantic information.

Expand Down
6 changes: 3 additions & 3 deletions source/declarations.tex
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@
point of call is to be preferred to the usual function call mechanism.
An implementation is not required to perform this inline substitution at
the point of call; however, even if this inline substitution is omitted,
the other rules for inline functions specified in this section shall
the other rules for inline functions specified in this subclause shall
still be respected.

\pnum
Expand Down Expand Up @@ -1110,7 +1110,7 @@
\ref{class},
and
\ref{temp.res}, respectively. The remaining
\grammarterm{type-specifier}{s} are discussed in the rest of this section.
\grammarterm{type-specifier}{s} are discussed in the rest of this subclause.
\end{note}

\rSec3[dcl.type.cv]{The \grammarterm{cv-qualifier}{s}}%
Expand Down Expand Up @@ -1609,7 +1609,7 @@

\pnum
A program that uses \tcode{auto} or \tcode{decltype(auto)} in a context not
explicitly allowed in this section is ill-formed.
explicitly allowed in this subclause is ill-formed.

\pnum
If the \grammarterm{init-declarator-list} contains more than one
Expand Down
4 changes: 2 additions & 2 deletions source/declarators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3018,7 +3018,7 @@
to convert the expression, the program is ill-formed.
\begin{note} If an initializer is itself an initializer list,
the element is list-initialized, which will result in a recursive application
of the rules in this section if the element is an aggregate. \end{note}
of the rules in this subclause if the element is an aggregate. \end{note}
\end{itemize}
\begin{example}
\begin{codeblock}
Expand Down Expand Up @@ -3895,7 +3895,7 @@

\item Otherwise, if \tcode{T} is a character array and the initializer list has a
single element that is an appropriately-typed string literal\iref{dcl.init.string},
initialization is performed as described in that section.
initialization is performed as described in that subclause.

\item Otherwise, if \tcode{T} is an aggregate, aggregate initialization is
performed\iref{dcl.init.aggr}.
Expand Down
2 changes: 1 addition & 1 deletion source/diagnostics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@
Classes may be derived from \tcode{error_category} to support
categories of errors in addition to those defined in this document.
Such classes shall behave as specified in this
subclause. \begin{note} \tcode{error_category} objects are
subclause~\ref{syserr.errcat}. \begin{note} \tcode{error_category} objects are
passed by reference, and two such objects
are equal if they have the same address. This means that applications using
custom \tcode{error_category} types should create a single object of each
Expand Down
4 changes: 2 additions & 2 deletions source/exceptions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
\end{example}

\pnum
In this section, ``before'' and ``after'' refer to the
In this Clause, ``before'' and ``after'' refer to the
``sequenced before'' relation\iref{intro.execution}.

\rSec1[except.throw]{Throwing an exception}%
Expand Down Expand Up @@ -362,7 +362,7 @@
\indextext{unwinding!stack}%
As control passes from the point where an exception is thrown
to a handler,
destructors are invoked by a process, specified in this section, called
destructors are invoked by a process, specified in this subclause, called
\defn{stack unwinding}.

\pnum
Expand Down
14 changes: 7 additions & 7 deletions source/expressions.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2324,7 +2324,7 @@
it is replaced by the return type
of the function selected by overload resolution
for class template deduction\iref{over.match.class.deduct}
for the remainder of this section.
for the remainder of this subclause.

\pnum
If the initializer is a parenthesized single expression,
Expand Down Expand Up @@ -2826,7 +2826,7 @@
the result refers to the object or the specified base class subobject
thereof; otherwise, the lvalue-to-rvalue conversion\iref{conv.lval}
is applied to the bit-field and the resulting prvalue is used as the
\grammarterm{expression} of the \tcode{static_cast} for the remainder of this section.
\grammarterm{expression} of the \tcode{static_cast} for the remainder of this subclause.
If \tcode{T2} is an inaccessible\iref{class.access} or
ambiguous\iref{class.member.lookup} base class of \tcode{T1},
a program that necessitates such a cast is ill-formed.
Expand Down Expand Up @@ -3168,7 +3168,7 @@

\pnum
\begin{note}
Subject to the restrictions in this section, an expression may be cast
Subject to the restrictions in this subclause, an expression may be cast
to its own type using a \tcode{const_cast} operator.
\end{note}

Expand Down Expand Up @@ -4156,7 +4156,7 @@
If the operand has a class type, the operand is converted to a pointer
type by calling the above-mentioned conversion function, and the
converted operand is used in place of the original operand for the
remainder of this section.
remainder of this subclause.
In the first alternative
(\defnx{delete object}{object!delete}), the value of the operand of \tcode{delete} may
be a null pointer value, a pointer to a non-array object
Expand Down Expand Up @@ -5149,7 +5149,7 @@
of the same value category and
of types \cvqual{cv1} \tcode{T} and \cvqual{cv2} \tcode{T}, respectively,
the operands are considered to be of type \cvqual{cv} \tcode{T}
for the remainder of this section,
for the remainder of this subclause,
where \cvqual{cv} is the union of \cvqual{cv1} and \cvqual{cv2}.

\pnum
Expand Down Expand Up @@ -5206,7 +5206,7 @@
Otherwise, if exactly one conversion sequence can be formed,
that conversion is applied to the chosen operand
and the converted operand is used in place of the original operand for
the remainder of this section.
the remainder of this subclause.
\begin{note}
The conversion might be ill-formed even if an implicit conversion
sequence could be formed.
Expand All @@ -5226,7 +5226,7 @@
If the overload resolution fails, the program is ill-formed. Otherwise,
the conversions thus determined are applied, and the converted operands
are used in place of the original operands for the remainder of this
section.
subclause.

\pnum
Lvalue-to-rvalue\iref{conv.lval}, array-to-pointer\iref{conv.array},
Expand Down
2 changes: 1 addition & 1 deletion source/future.tex
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
is defined as:
Normative for the current edition of this International Standard,
but having been identified as a candidate for removal from future revisions.
An implementation may declare library names and entities described in this section with the
An implementation may declare library names and entities described in this Clause with the
\tcode{deprecated} attribute\iref{dcl.attr.deprecated}.

\rSec1[depr.static_constexpr]{Redeclaration of \tcode{static constexpr} data members}
Expand Down
2 changes: 0 additions & 2 deletions source/intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,6 @@
rewritten by the implementation in any of the above ways because the
same result will occur. \end{note}



\rSec1[intro.structure]{Structure of this document}

\pnum
Expand Down
4 changes: 2 additions & 2 deletions source/iostreams.tex
Original file line number Diff line number Diff line change
Expand Up @@ -8493,7 +8493,7 @@
\pnum
In order to support file I/O and multibyte/wide character conversion,
conversions are performed using members of a facet, referred to as
\tcode{a_codecvt} in following sections, obtained as if by
\tcode{a_codecvt} in following subclauses, obtained as if by

\begin{codeblock}
const codecvt<charT, char, typename traits::state_type>& a_codecvt =
Expand Down Expand Up @@ -10734,7 +10734,7 @@

\pnum
\begin{note}
The format conversions described in this section
The format conversions described in this subclause
are not applied on POSIX-based operating systems
because on these systems:
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion source/iterators.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3069,7 +3069,7 @@
\rSec3[istreambuf.iterator.cons]{\tcode{istreambuf_iterator} constructors}

\pnum
For each \tcode{istreambuf_iterator} constructor in this section,
For each \tcode{istreambuf_iterator} constructor in this subclause,
an end-of-stream iterator is constructed if and only if
the exposition-only member \tcode{sbuf_} is initialized with a null pointer value.

Expand Down
10 changes: 5 additions & 5 deletions source/lib-intro.tex
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@
Whenever a name \tcode{x} defined in the standard library is mentioned,
the name \tcode{x} is assumed to be fully qualified as
\tcode{::std::x},
unless explicitly described otherwise. For example, if the \effects section
unless explicitly described otherwise. For example, if the \effects element
for library function \tcode{F} is described as calling library function \tcode{G},
the function
\tcode{::std::G}
Expand Down Expand Up @@ -1327,7 +1327,7 @@
\rSec3[using.overview]{Overview}

\pnum
This section describes how a \Cpp program gains access to the facilities of the
Subclause \ref{using} describes how a \Cpp program gains access to the facilities of the
\Cpp standard library. \ref{using.headers} describes effects during translation
phase 4, while~\ref{using.linkage} describes effects during phase
8\iref{lex.phases}.
Expand Down Expand Up @@ -2151,7 +2151,7 @@
\rSec3[constraints.overview]{Overview}

\pnum
This section describes restrictions on \Cpp programs that use the facilities of
Subclause \ref{constraints} describes restrictions on \Cpp programs that use the facilities of
the \Cpp standard library. The following subclauses specify constraints on the
program's use of namespaces\iref{namespace.std}, its use of various reserved
names\iref{reserved.names}, its use of headers\iref{alt.headers}, its use of
Expand Down Expand Up @@ -2654,7 +2654,7 @@
\rSec3[conforming.overview]{Overview}

\pnum
This section describes the constraints upon, and latitude of, implementations of the \Cpp standard library.
Subclause \ref{conforming} describes the constraints upon, and latitude of, implementations of the \Cpp standard library.

\pnum
An implementation's use of headers is discussed in~\ref{res.on.headers}, its use
Expand Down Expand Up @@ -2803,7 +2803,7 @@
\rSec3[res.on.data.races]{Data race avoidance}

\pnum
This section specifies requirements that implementations shall meet to prevent data
This subclause specifies requirements that implementations shall meet to prevent data
races\iref{intro.multithread}.
Every standard library function shall meet each requirement unless otherwise specified.
Implementations may prevent data races in cases other than those specified below.
Expand Down
Loading