Skip to content

Commit 9df58d5

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 89801f1 commit 9df58d5

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
@@ -3273,8 +3273,8 @@
32733273
describes the lifetime of base and member subobjects. \end{note}
32743274

32753275
\pnum
3276-
The properties ascribed to objects and references throughout this International
3277-
Standard apply for a given object or reference only during its lifetime. \begin{note}
3276+
The properties ascribed to objects and references throughout this document
3277+
apply for a given object or reference only during its lifetime. \begin{note}
32783278
In particular, before the lifetime of an object starts and after its
32793279
lifetime ends there are significant restrictions on the use of the
32803280
object, as described below, in~\ref{class.base.init} and
@@ -3849,8 +3849,8 @@
38493849
\pnum
38503850
\indextext{Boolean type}%
38513851
Values of type \tcode{bool} are either \tcode{true} or
3852-
\tcode{false}.\footnote{Using a \tcode{bool} value in ways described by this International
3853-
Standard as ``undefined'', such as by examining the value of an
3852+
\tcode{false}.\footnote{Using a \tcode{bool} value in ways described by this document
3853+
as ``undefined'', such as by examining the value of an
38543854
uninitialized automatic object, might cause it to behave as if it is
38553855
neither \tcode{true} nor \tcode{false}.}
38563856
\begin{note} There are no \tcode{signed}, \tcode{unsigned}, \tcode{short},
@@ -3875,7 +3875,7 @@
38753875
begin with 1, and are multiplied by successive integral power of 2,
38763876
except perhaps for the bit with the highest position. (Adapted from the
38773877
\doccite{American National Dictionary for Information Processing Systems}.)}
3878-
\begin{example} This International Standard permits two's complement,
3878+
\begin{example} This document permits two's complement,
38793879
ones' complement and signed magnitude representations for integral types.
38803880
\end{example}
38813881

@@ -3897,7 +3897,7 @@
38973897
floating-point types}.
38983898
\indextext{floating-point type!implementation-defined}%
38993899
\begin{note}
3900-
This International Standard imposes no requirements on the accuracy of
3900+
This document imposes no requirements on the accuracy of
39013901
floating-point operations; see also~\ref{support.limits}.
39023902
\end{note}
39033903
Integral and floating types are collectively
@@ -4158,7 +4158,7 @@
41584158
\end{floattable}
41594159

41604160
\pnum
4161-
In this International Standard, the notation \cv{} (or
4161+
In this document, the notation \cv{} (or
41624162
\cvqual{cv1}, \cvqual{cv2}, etc.), used in the description of types,
41634163
represents an arbitrary set of cv-qualifiers, i.e., one of
41644164
\{\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

@@ -1075,8 +1075,8 @@
10751075
\change Additional restrictions on macro names.
10761076
\rationale Avoid hard to diagnose or non-portable constructs.
10771077
\effect
1078-
Names of attribute identifiers may not be used as macro names. Valid \Cpp
1079-
2003 code that defines \tcode{override}, \tcode{final},
1078+
Names of attribute identifiers may not be used as macro names. Valid \CppIII
1079+
code that defines \tcode{override}, \tcode{final},
10801080
\tcode{carries_dependency}, or \tcode{noreturn} as macros is invalid in this
10811081
International Standard.
10821082

source/declarations.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3378,7 +3378,7 @@
33783378
\end{bnf}
33793379

33803380
The \grammarterm{string-literal} indicates the required language linkage.
3381-
This International Standard specifies the semantics for the
3381+
This document specifies the semantics for the
33823382
\grammarterm{string-literal}{s} \tcode{"C"} and \tcode{"C++"}. Use of a
33833383
\grammarterm{string-literal} other than \tcode{"C"} or \tcode{"C++"} is
33843384
conditionally-supported, with \impldef{semantics of linkage specifiers} semantics.
@@ -3722,7 +3722,7 @@
37223722
\pnum
37233723
For an \grammarterm{attribute-token}
37243724
(including an \grammarterm{attribute-scoped-token})
3725-
not specified in this International Standard, the
3725+
not specified in this document, the
37263726
behavior is \impldef{behavior of non-standard attributes}.
37273727
Any \grammarterm{attribute-token} that is not recognized by the implementation
37283728
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
@@ -4972,7 +4972,7 @@
49724972
\item
49734973
an operation that would have undefined behavior
49744974
as specified in Clauses~\ref{intro} through~\ref{cpp}
4975-
of this International Standard \begin{note} including,
4975+
of this document \begin{note} including,
49764976
for example, signed integer overflow~(Clause \ref{expr}), certain
49774977
pointer arithmetic~(\ref{expr.add}), division by
49784978
zero~(\ref{expr.mul}), or certain shift operations~(\ref{expr.shift})
@@ -5108,7 +5108,7 @@
51085108
If \tcode{e} satisfies the constraints of a core constant expression, but
51095109
evaluation of \tcode{e} would evaluate an operation that has undefined behavior
51105110
as specified in Clauses~\ref{library} through~\ref{\lastlibchapter} of this
5111-
International Standard, it is unspecified whether \tcode{e} is a core constant
5111+
document, it is unspecified whether \tcode{e} is a core constant
51125112
expression.
51135113

51145114
\begin{example}
@@ -5231,7 +5231,7 @@
52315231
function.
52325232

52335233
\pnum
5234-
\begin{note} Since this International Standard
5234+
\begin{note} Since this document
52355235
imposes no restrictions on the accuracy of floating-point operations, it is unspecified whether the
52365236
evaluation of a floating-point expression during translation yields the same result as the
52375237
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
@@ -1307,7 +1307,7 @@
13071307
\pnum
13081308
To enable old function adaptors to manipulate function objects
13091309
that take one or two arguments,
1310-
many of the function objects in this International Standard
1310+
many of the function objects in this document
13111311
correspondingly provide \grammarterm{typedef-name}{s}
13121312
\tcode{argument_type} and \tcode{result_type}
13131313
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
@@ -267,12 +267,12 @@
267267

268268
\indexdefn{behavior!undefined}%
269269
\definition{undefined behavior}{defns.undefined}
270-
behavior for which this International Standard
270+
behavior for which this document
271271
imposes no requirements
272272

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

299299
\indexdefn{program!well-formed}%
@@ -333,34 +333,34 @@
333333
\indextext{conformance requirements!general|(}%
334334
The set of
335335
\defn{diagnosable rules}
336-
consists of all syntactic and semantic rules in this International
337-
Standard except for those rules containing an explicit notation that
336+
consists of all syntactic and semantic rules in this document
337+
except for those rules containing an explicit notation that
338338
``no diagnostic is required'' or which are described as resulting in
339339
``undefined behavior''.
340340

341341
\pnum
342342
\indextext{conformance requirements!method of description}%
343-
Although this International Standard states only requirements on \Cpp
343+
Although this document states only requirements on \Cpp
344344
implementations, those requirements are often easier to understand if
345345
they are phrased as requirements on programs, parts of programs, or
346346
execution of programs. Such requirements have the following meaning:
347347
\begin{itemize}
348348
\item
349349
If a program contains no violations of the rules in this
350-
International Standard, a conforming implementation shall,
350+
document, a conforming implementation shall,
351351
within its resource limits, accept and correctly execute\footnote{``Correct execution'' can include undefined behavior, depending on
352352
the data being processed; see Clause~\ref{intro.defs} and~\ref{intro.execution}.}
353353
that program.
354354
\item
355355
\indextext{message!diagnostic}%
356356
If a program contains a violation of any diagnosable rule or an occurrence
357-
of a construct described in this International Standard as ``conditionally-supported'' when
357+
of a construct described in this document as ``conditionally-supported'' when
358358
the implementation does not support that construct, a conforming implementation
359359
shall issue at least one diagnostic message.
360360
\item
361361
\indextext{behavior!undefined}%
362362
If a program contains a violation of a rule for which no diagnostic
363-
is required, this International Standard places no requirement on
363+
is required, this document places no requirement on
364364
implementations with respect to that program.
365365
\end{itemize}
366366
\begin{note}
@@ -400,7 +400,7 @@
400400
\pnum
401401
Two kinds of implementations are defined: a \defn{hosted implementation} and a
402402
\defn{freestanding implementation}. For a hosted implementation, this
403-
International Standard defines the set of available libraries. A freestanding
403+
document defines the set of available libraries. A freestanding
404404
implementation is one in which execution may take place without the benefit of
405405
an operating system, and has an \impldef{required libraries for freestanding
406406
implementation} set of libraries that includes certain language-support
@@ -411,7 +411,7 @@
411411
additional library functions), provided they do not alter the
412412
behavior of any well-formed program.
413413
Implementations are required to diagnose programs that use such
414-
extensions that are ill-formed according to this International Standard.
414+
extensions that are ill-formed according to this document.
415415
Having done so, however, they can compile and execute such programs.
416416

417417
\pnum
@@ -756,17 +756,17 @@
756756
\pnum
757757
\indextext{program execution|(}%
758758
\indextext{program execution!abstract machine}%
759-
The semantic descriptions in this International Standard define a
760-
parameterized nondeterministic abstract machine. This International
761-
Standard places no requirement on the structure of conforming
759+
The semantic descriptions in this document define a
760+
parameterized nondeterministic abstract machine. This document
761+
places no requirement on the structure of conforming
762762
implementations. In particular, they need not copy or emulate the
763763
structure of the abstract machine.
764764
\indextext{as-if rule}%
765765
\indextext{behavior!observable}%
766766
Rather, conforming implementations are required to emulate (only) the observable
767767
behavior of the abstract machine as explained below.\footnote{This provision is
768768
sometimes called the ``as-if'' rule, because an implementation is free to
769-
disregard any requirement of this International Standard as long as the result
769+
disregard any requirement of this document as long as the result
770770
is \emph{as if} the requirement had been obeyed, as far as can be determined
771771
from the observable behavior of the program. For instance, an actual
772772
implementation need not evaluate part of an expression if it can deduce that its
@@ -778,7 +778,7 @@
778778
\indextext{behavior!implementation-defined}%
779779
\pnum
780780
Certain aspects and operations of the abstract machine are described in this
781-
International Standard as implementation-defined (for example,
781+
document as implementation-defined (for example,
782782
\tcode{sizeof(int)}). These constitute the parameters of the abstract machine.
783783
Each implementation shall include documentation describing its characteristics
784784
and behavior in these respects.\footnote{This documentation also includes
@@ -790,20 +790,20 @@
790790
\indextext{behavior!unspecified}%
791791
\pnum
792792
Certain other aspects and operations of the abstract machine are
793-
described in this International Standard as unspecified (for example,
793+
described in this document as unspecified (for example,
794794
evaluation of expressions in a \grammarterm{new-initializer} if the allocation
795795
function fails to allocate memory~(\ref{expr.new})). Where possible, this
796-
International Standard defines a set of allowable behaviors. These
796+
document defines a set of allowable behaviors. These
797797
define the nondeterministic aspects of the abstract machine. An instance
798798
of the abstract machine can thus have more than one possible execution
799799
for a given program and a given input.
800800

801801
\indextext{behavior!undefined}%
802802
\pnum
803-
Certain other operations are described in this International Standard as
803+
Certain other operations are described in this document as
804804
undefined (for example, the effect of
805805
attempting to modify a \tcode{const} object).
806-
\begin{note} This International Standard imposes no requirements on the
806+
\begin{note} This document imposes no requirements on the
807807
behavior of programs that contain undefined behavior. \end{note}
808808

809809
\indextext{program!well-formed}%
@@ -814,7 +814,7 @@
814814
of the corresponding instance of the abstract machine with the
815815
same program and the same input.
816816
\indextext{behavior!undefined}%
817-
However, if any such execution contains an undefined operation, this International Standard places no
817+
However, if any such execution contains an undefined operation, this document places no
818818
requirement on the implementation executing that program with that input
819819
(not even with regard to operations preceding the first undefined
820820
operation).
@@ -1160,7 +1160,7 @@
11601160
through a pointer or reference~(\ref{basic.compound}).} Under a hosted
11611161
implementation, a \Cpp program can have more than one thread running
11621162
concurrently. The execution of each thread proceeds as defined by the remainder
1163-
of this International Standard. The execution of the entire program consists of an execution
1163+
of this document. The execution of the entire program consists of an execution
11641164
of all of its threads. \begin{note} Usually the execution can be viewed as an
11651165
interleaving of all its threads. However, some kinds of atomic operations, for
11661166
example, allow executions inconsistent with a simple interleaving, as described
@@ -1490,7 +1490,7 @@
14901490
\pnum
14911491
\begin{note} Compiler transformations that introduce assignments to a potentially
14921492
shared memory location that would not be modified by the abstract machine are
1493-
generally precluded by this International Standard, since such an assignment might overwrite
1493+
generally precluded by this document, since such an assignment might overwrite
14941494
another assignment by a different thread in cases in which an abstract machine
14951495
execution would not have encountered a data race. This includes implementations
14961496
of data member assignment that overwrite adjacent members in separate memory
@@ -1501,7 +1501,7 @@
15011501
\pnum
15021502
\begin{note} Transformations that introduce a speculative read of a potentially
15031503
shared memory location may not preserve the semantics of the \Cpp program as
1504-
defined in this International Standard, since they potentially introduce a data race. However,
1504+
defined in this document, since they potentially introduce a data race. However,
15051505
they are typically valid in the context of an optimizing compiler that targets a
15061506
specific machine with well-defined semantics for data races. They would be
15071507
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~(\ref{headers})
32+
\defnx{source files}{source file} in this document.
33+
A source file together with all the headers~(\ref{headers})
3434
and source files included~(\ref{cpp.include}) via the preprocessing
3535
directive \tcode{\#include}, less any source lines skipped by any of the
3636
conditional inclusion~(\ref{cpp.cond}) preprocessing directives, is
@@ -817,7 +817,7 @@
817817
\indextext{constant}%
818818
\indextext{literal!constant}%
819819
There are several kinds of literals.\footnote{The term ``literal'' generally designates, in this
820-
International Standard, those tokens that are called ``constants'' in
820+
document, those tokens that are called ``constants'' in
821821
ISO C. }
822822

823823
\begin{bnf}

0 commit comments

Comments
 (0)