Skip to content

Commit 6218c21

Browse files
committed
Replace "this International Standard" with "this document" when
referring to the document as a body of text. Cases where that phrasing is used to compare this standard to other revisions of the C++ standard retain this phrasing for clarity. Fixes ISO 20 (C++17 DIS)
1 parent 1323266 commit 6218c21

16 files changed

+69
-70
lines changed

source/algorithms.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@
12311231

12321232
\rSec2[algorithms.parallel.defns]{Terms and definitions}
12331233
\pnum
1234-
A \defn{parallel algorithm} is a function template listed in this International Standard with
1234+
A \defn{parallel algorithm} is a function template listed in this document with
12351235
a template parameter named \tcode{ExecutionPolicy}.
12361236

12371237
\pnum

source/basic.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3280,8 +3280,8 @@
32803280
describes the lifetime of base and member subobjects. \end{note}
32813281

32823282
\pnum
3283-
The properties ascribed to objects and references throughout this International
3284-
Standard apply for a given object or reference only during its lifetime. \begin{note}
3283+
The properties ascribed to objects and references throughout this document
3284+
apply for a given object or reference only during its lifetime. \begin{note}
32853285
In particular, before the lifetime of an object starts and after its
32863286
lifetime ends there are significant restrictions on the use of the
32873287
object, as described below, in~\ref{class.base.init} and
@@ -3859,8 +3859,8 @@
38593859
\pnum
38603860
\indextext{Boolean type}%
38613861
Values of type \tcode{bool} are either \tcode{true} or
3862-
\tcode{false}.\footnote{Using a \tcode{bool} value in ways described by this International
3863-
Standard as ``undefined'', such as by examining the value of an
3862+
\tcode{false}.\footnote{Using a \tcode{bool} value in ways described by this document
3863+
as ``undefined'', such as by examining the value of an
38643864
uninitialized automatic object, might cause it to behave as if it is
38653865
neither \tcode{true} nor \tcode{false}.}
38663866
\begin{note} There are no \tcode{signed}, \tcode{unsigned}, \tcode{short},
@@ -3885,7 +3885,7 @@
38853885
begin with 1, and are multiplied by successive integral power of 2,
38863886
except perhaps for the bit with the highest position. (Adapted from the
38873887
\doccite{American National Dictionary for Information Processing Systems}.)}
3888-
\begin{example} This International Standard permits two's complement,
3888+
\begin{example} This document permits two's complement,
38893889
ones' complement and signed magnitude representations for integral types.
38903890
\end{example}
38913891

@@ -3907,7 +3907,7 @@
39073907
floating-point types}.
39083908
\indextext{floating-point type!implementation-defined}%
39093909
\begin{note}
3910-
This International Standard imposes no requirements on the accuracy of
3910+
This document imposes no requirements on the accuracy of
39113911
floating-point operations; see also~\ref{support.limits}.
39123912
\end{note}
39133913
Integral and floating types are collectively
@@ -4168,7 +4168,7 @@
41684168
\end{floattable}
41694169

41704170
\pnum
4171-
In this International Standard, the notation \cv{} (or
4171+
In this document, the notation \cv{} (or
41724172
\cvqual{cv1}, \cvqual{cv2}, etc.), used in the description of types,
41734173
represents an arbitrary set of cv-qualifiers, i.e., one of
41744174
\{\tcode{const}\}, \{\tcode{volatile}\}, \{\tcode{const},

source/compatibility.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
Those problems not found by typesafe linkage will continue to
192192
function properly,
193193
according to the ``layout compatibility rules'' of this
194-
International Standard.
194+
document.
195195
\howwide
196196
Common.
197197

@@ -1112,8 +1112,8 @@
11121112
\change Additional restrictions on macro names.
11131113
\rationale Avoid hard to diagnose or non-portable constructs.
11141114
\effect
1115-
Names of attribute identifiers may not be used as macro names. Valid \Cpp
1116-
2003 code that defines \tcode{override}, \tcode{final},
1115+
Names of attribute identifiers may not be used as macro names. Valid \CppIII
1116+
code that defines \tcode{override}, \tcode{final},
11171117
\tcode{carries_dependency}, or \tcode{noreturn} as macros is invalid in this
11181118
International Standard.
11191119

source/declarations.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3372,7 +3372,7 @@
33723372
\end{bnf}
33733373

33743374
The \grammarterm{string-literal} indicates the required language linkage.
3375-
This International Standard specifies the semantics for the
3375+
This document specifies the semantics for the
33763376
\grammarterm{string-literal}{s} \tcode{"C"} and \tcode{"C++"}. Use of a
33773377
\grammarterm{string-literal} other than \tcode{"C"} or \tcode{"C++"} is
33783378
conditionally-supported, with \impldef{semantics of linkage specifiers} semantics.
@@ -3716,7 +3716,7 @@
37163716
\pnum
37173717
For an \grammarterm{attribute-token}
37183718
(including an \grammarterm{attribute-scoped-token})
3719-
not specified in this International Standard, the
3719+
not specified in this document, the
37203720
behavior is \impldef{behavior of non-standard attributes}.
37213721
Any \grammarterm{attribute-token} that is not recognized by the implementation
37223722
is ignored.

source/diagnostics.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -937,8 +937,7 @@
937937
The class \tcode{error_category} serves as a base class for types used
938938
to identify the source and encoding of a particular category of error code.
939939
Classes may be derived from \tcode{error_category} to support
940-
categories of errors in addition to those defined in this International
941-
Standard.
940+
categories of errors in addition to those defined in this document.
942941
Such classes shall behave as specified in this
943942
subclause. \begin{note} \tcode{error_category} objects are
944943
passed by reference, and two such objects

source/expressions.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5394,7 +5394,7 @@
53945394
\item
53955395
an operation that would have undefined behavior
53965396
as specified in \ref{intro} through \ref{cpp}
5397-
of this International Standard \begin{note} including,
5397+
of this document \begin{note} including,
53985398
for example, signed integer overflow\iref{expr}, certain
53995399
pointer arithmetic\iref{expr.add}, division by
54005400
zero\iref{expr.mul}, or certain shift operations\iref{expr.shift}
@@ -5530,7 +5530,7 @@
55305530
If \tcode{e} satisfies the constraints of a core constant expression, but
55315531
evaluation of \tcode{e} would evaluate an operation that has undefined behavior
55325532
as specified in \ref{library} through \ref{\lastlibchapter} of this
5533-
International Standard, it is unspecified whether \tcode{e} is a core constant
5533+
document, it is unspecified whether \tcode{e} is a core constant
55345534
expression.
55355535

55365536
\begin{example}
@@ -5673,7 +5673,7 @@
56735673
function.
56745674

56755675
\pnum
5676-
\begin{note} Since this International Standard
5676+
\begin{note} Since this document
56775677
imposes no restrictions on the accuracy of floating-point operations, it is unspecified whether the
56785678
evaluation of a floating-point expression during translation yields the same result as the
56795679
evaluation of the same expression (or the same operations on the same values) during program

source/future.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@
13041304
\pnum
13051305
To enable old function adaptors to manipulate function objects
13061306
that take one or two arguments,
1307-
many of the function objects in this International Standard
1307+
many of the function objects in this document
13081308
correspondingly provide \grammarterm{typedef-name}{s}
13091309
\tcode{argument_type} and \tcode{result_type}
13101310
for function objects that take one argument and

source/intro.tex

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@
288288

289289
\indexdefn{behavior!undefined}%
290290
\definition{undefined behavior}{defns.undefined}
291-
behavior for which this International Standard
291+
behavior for which this document
292292
imposes no requirements
293293

294294
\begin{defnote}
295295
Undefined behavior may be expected when
296-
this International Standard omits any explicit
296+
this document omits any explicit
297297
definition of behavior or when a program uses an erroneous construct or erroneous data.
298298
Permissible undefined behavior ranges
299299
from ignoring the situation completely with unpredictable results, to
@@ -314,7 +314,7 @@
314314
\begin{defnote}
315315
The implementation is not required to
316316
document which behavior occurs. The range of
317-
possible behaviors is usually delineated by this International Standard.
317+
possible behaviors is usually delineated by this document.
318318
\end{defnote}
319319

320320
\indexdefn{program!well-formed}%
@@ -354,34 +354,34 @@
354354
\indextext{conformance requirements!general|(}%
355355
The set of
356356
\defn{diagnosable rules}
357-
consists of all syntactic and semantic rules in this International
358-
Standard except for those rules containing an explicit notation that
357+
consists of all syntactic and semantic rules in this document
358+
except for those rules containing an explicit notation that
359359
``no diagnostic is required'' or which are described as resulting in
360360
``undefined behavior''.
361361

362362
\pnum
363363
\indextext{conformance requirements!method of description}%
364-
Although this International Standard states only requirements on \Cpp
364+
Although this document states only requirements on \Cpp
365365
implementations, those requirements are often easier to understand if
366366
they are phrased as requirements on programs, parts of programs, or
367367
execution of programs. Such requirements have the following meaning:
368368
\begin{itemize}
369369
\item
370370
If a program contains no violations of the rules in this
371-
International Standard, a conforming implementation shall,
371+
document, a conforming implementation shall,
372372
within its resource limits, accept and correctly execute\footnote{``Correct execution'' can include undefined behavior, depending on
373373
the data being processed; see \ref{intro.defs} and~\ref{intro.execution}.}
374374
that program.
375375
\item
376376
\indextext{message!diagnostic}%
377377
If a program contains a violation of any diagnosable rule or an occurrence
378-
of a construct described in this International Standard as ``conditionally-supported'' when
378+
of a construct described in this document as ``conditionally-supported'' when
379379
the implementation does not support that construct, a conforming implementation
380380
shall issue at least one diagnostic message.
381381
\item
382382
\indextext{behavior!undefined}%
383383
If a program contains a violation of a rule for which no diagnostic
384-
is required, this International Standard places no requirement on
384+
is required, this document places no requirement on
385385
implementations with respect to that program.
386386
\end{itemize}
387387
\begin{note}
@@ -421,7 +421,7 @@
421421
\pnum
422422
Two kinds of implementations are defined: a \defn{hosted implementation} and a
423423
\defn{freestanding implementation}. For a hosted implementation, this
424-
International Standard defines the set of available libraries. A freestanding
424+
document defines the set of available libraries. A freestanding
425425
implementation is one in which execution may take place without the benefit of
426426
an operating system, and has an \impldef{required libraries for freestanding
427427
implementation} set of libraries that includes certain language-support
@@ -432,7 +432,7 @@
432432
additional library functions), provided they do not alter the
433433
behavior of any well-formed program.
434434
Implementations are required to diagnose programs that use such
435-
extensions that are ill-formed according to this International Standard.
435+
extensions that are ill-formed according to this document.
436436
Having done so, however, they can compile and execute such programs.
437437

438438
\pnum
@@ -777,17 +777,17 @@
777777
\pnum
778778
\indextext{program execution|(}%
779779
\indextext{program execution!abstract machine}%
780-
The semantic descriptions in this International Standard define a
781-
parameterized nondeterministic abstract machine. This International
782-
Standard places no requirement on the structure of conforming
780+
The semantic descriptions in this document define a
781+
parameterized nondeterministic abstract machine. This document
782+
places no requirement on the structure of conforming
783783
implementations. In particular, they need not copy or emulate the
784784
structure of the abstract machine.
785785
\indextext{as-if rule}%
786786
\indextext{behavior!observable}%
787787
Rather, conforming implementations are required to emulate (only) the observable
788788
behavior of the abstract machine as explained below.\footnote{This provision is
789789
sometimes called the ``as-if'' rule, because an implementation is free to
790-
disregard any requirement of this International Standard as long as the result
790+
disregard any requirement of this document as long as the result
791791
is \emph{as if} the requirement had been obeyed, as far as can be determined
792792
from the observable behavior of the program. For instance, an actual
793793
implementation need not evaluate part of an expression if it can deduce that its
@@ -799,7 +799,7 @@
799799
\indextext{behavior!implementation-defined}%
800800
\pnum
801801
Certain aspects and operations of the abstract machine are described in this
802-
International Standard as implementation-defined (for example,
802+
document as implementation-defined (for example,
803803
\tcode{sizeof(int)}). These constitute the parameters of the abstract machine.
804804
Each implementation shall include documentation describing its characteristics
805805
and behavior in these respects.\footnote{This documentation also includes
@@ -811,20 +811,20 @@
811811
\indextext{behavior!unspecified}%
812812
\pnum
813813
Certain other aspects and operations of the abstract machine are
814-
described in this International Standard as unspecified (for example,
814+
described in this document as unspecified (for example,
815815
evaluation of expressions in a \grammarterm{new-initializer} if the allocation
816816
function fails to allocate memory\iref{expr.new}). Where possible, this
817-
International Standard defines a set of allowable behaviors. These
817+
document defines a set of allowable behaviors. These
818818
define the nondeterministic aspects of the abstract machine. An instance
819819
of the abstract machine can thus have more than one possible execution
820820
for a given program and a given input.
821821

822822
\indextext{behavior!undefined}%
823823
\pnum
824-
Certain other operations are described in this International Standard as
824+
Certain other operations are described in this document as
825825
undefined (for example, the effect of
826826
attempting to modify a \tcode{const} object).
827-
\begin{note} This International Standard imposes no requirements on the
827+
\begin{note} This document imposes no requirements on the
828828
behavior of programs that contain undefined behavior. \end{note}
829829

830830
\indextext{program!well-formed}%
@@ -835,7 +835,7 @@
835835
of the corresponding instance of the abstract machine with the
836836
same program and the same input.
837837
\indextext{behavior!undefined}%
838-
However, if any such execution contains an undefined operation, this International Standard places no
838+
However, if any such execution contains an undefined operation, this document places no
839839
requirement on the implementation executing that program with that input
840840
(not even with regard to operations preceding the first undefined
841841
operation).
@@ -1181,7 +1181,7 @@
11811181
through a pointer or reference\iref{basic.compound}.} Under a hosted
11821182
implementation, a \Cpp program can have more than one thread running
11831183
concurrently. The execution of each thread proceeds as defined by the remainder
1184-
of this International Standard. The execution of the entire program consists of an execution
1184+
of this document. The execution of the entire program consists of an execution
11851185
of all of its threads. \begin{note} Usually the execution can be viewed as an
11861186
interleaving of all its threads. However, some kinds of atomic operations, for
11871187
example, allow executions inconsistent with a simple interleaving, as described
@@ -1511,7 +1511,7 @@
15111511
\pnum
15121512
\begin{note} Compiler transformations that introduce assignments to a potentially
15131513
shared memory location that would not be modified by the abstract machine are
1514-
generally precluded by this International Standard, since such an assignment might overwrite
1514+
generally precluded by this document, since such an assignment might overwrite
15151515
another assignment by a different thread in cases in which an abstract machine
15161516
execution would not have encountered a data race. This includes implementations
15171517
of data member assignment that overwrite adjacent members in separate memory
@@ -1522,7 +1522,7 @@
15221522
\pnum
15231523
\begin{note} Transformations that introduce a speculative read of a potentially
15241524
shared memory location may not preserve the semantics of the \Cpp program as
1525-
defined in this International Standard, since they potentially introduce a data race. However,
1525+
defined in this document, since they potentially introduce a data race. However,
15261526
they are typically valid in the context of an optimizing compiler that targets a
15271527
specific machine with well-defined semantics for data races. They would be
15281528
invalid for a hypothetical machine that is not tolerant of races or provides

source/iterators.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
function template
7373
that takes iterators
7474
works as well with regular pointers.
75-
This International Standard defines
75+
This document defines
7676
five categories of iterators, according to the operations
7777
defined on them:
7878
\techterm{input iterators},

source/lex.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
\indextext{conventions!lexical|(}%
3030
\indextext{compilation!separate|(}%
3131
The text of the program is kept in units called
32-
\defnx{source files}{source file} in this International
33-
Standard. A source file together with all the headers\iref{headers}
32+
\defnx{source files}{source file} in this document.
33+
A source file together with all the headers\iref{headers}
3434
and source files included\iref{cpp.include} via the preprocessing
3535
directive \tcode{\#include}, less any source lines skipped by any of the
3636
conditional inclusion\iref{cpp.cond} preprocessing directives, is
@@ -819,7 +819,7 @@
819819
\indextext{constant}%
820820
\indextext{literal!constant}%
821821
There are several kinds of literals.\footnote{The term ``literal'' generally designates, in this
822-
International Standard, those tokens that are called ``constants'' in
822+
document, those tokens that are called ``constants'' in
823823
ISO C. }
824824

825825
\begin{bnf}

0 commit comments

Comments
 (0)