Skip to content

Commit acb06e3

Browse files
committed
macros.tex: change the \oldconcept prefix to "Cpp17"
Also update "Cpp98"s in the text to "Cpp17" to agree.
1 parent 53b285d commit acb06e3

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

source/lib-intro.tex

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@
15881588
\tcode{T()} shall be a well-defined expression\iref{dcl.init} if one of those
15891589
signatures is called using the default argument\iref{dcl.fct.default}.
15901590

1591-
\indextext{requirements!\idxcode{Cpp98EqualityComparable}}%
1591+
\indextext{requirements!\idxcode{Cpp17EqualityComparable}}%
15921592
\begin{concepttable}{\oldconcept{EqualityComparable} requirements}{equalitycomparable}
15931593
{x{1in}x{1in}p{3in}}
15941594
\topline
@@ -1607,7 +1607,7 @@
16071607
\end{itemize} \\
16081608
\end{concepttable}
16091609

1610-
\indextext{requirements!\idxcode{Cpp98LessThanComparable}}%
1610+
\indextext{requirements!\idxcode{Cpp17LessThanComparable}}%
16111611
\begin{concepttable}{\oldconcept{LessThanComparable} requirements}{lessthancomparable}
16121612
{x{1in}x{1in}p{3in}}
16131613
\topline
@@ -1618,7 +1618,7 @@
16181618
\end{concepttable}
16191619

16201620
\enlargethispage{-3\baselineskip}
1621-
\indextext{requirements!\idxcode{Cpp98DefaultConstructible}}%
1621+
\indextext{requirements!\idxcode{Cpp17DefaultConstructible}}%
16221622
\begin{concepttable}{\oldconcept{DefaultConstructible} requirements}{defaultconstructible}
16231623
{x{2.15in}p{3in}}
16241624
\topline
@@ -1629,7 +1629,7 @@
16291629
or aggregate-initialized \\
16301630
\end{concepttable}
16311631

1632-
\indextext{requirements!\idxcode{Cpp98MoveConstructible}}%
1632+
\indextext{requirements!\idxcode{Cpp17MoveConstructible}}%
16331633
\begin{concepttable}{\oldconcept{MoveConstructible} requirements}{moveconstructible}
16341634
{p{1in}p{4.15in}}
16351635
\topline
@@ -1644,7 +1644,7 @@
16441644
work as specified whether \tcode{rv} has been moved from or not. \end{note}}\\
16451645
\end{concepttable}
16461646

1647-
\indextext{requirements!\idxcode{Cpp98CopyConstructible}}%
1647+
\indextext{requirements!\idxcode{Cpp17CopyConstructible}}%
16481648
\begin{concepttable}{\oldconcept{CopyConstructible} requirements (in addition to \oldconcept{MoveConstructible})}{copyconstructible}
16491649
{p{1in}p{4.15in}}
16501650
\topline
@@ -1654,7 +1654,7 @@
16541654
the value of \tcode{v} is unchanged and is equivalent to \tcode{T(v)} \\
16551655
\end{concepttable}
16561656

1657-
\indextext{requirements!\idxcode{Cpp98MoveAssignable}}%
1657+
\indextext{requirements!\idxcode{Cpp17MoveAssignable}}%
16581658
\begin{concepttable}{\oldconcept{MoveAssignable} requirements}{moveassignable}
16591659
{p{1in}p{1in}p{1in}p{1.9in}}
16601660
\topline
@@ -1670,15 +1670,15 @@
16701670
work as specified whether \tcode{rv} has been moved from or not. \end{note}}\\
16711671
\end{concepttable}
16721672

1673-
\indextext{requirements!\idxcode{Cpp98CopyAssignable}}%
1673+
\indextext{requirements!\idxcode{Cpp17CopyAssignable}}%
16741674
\begin{concepttable}{\oldconcept{CopyAssignable} requirements (in addition to \oldconcept{MoveAssignable})}{copyassignable}
16751675
{p{1in}p{1in}p{1in}p{1.9in}}
16761676
\topline
16771677
\hdstyle{Expression} & \hdstyle{Return type} & \hdstyle{Return value} & \hdstyle{Post-condition} \\ \capsep
16781678
\tcode{t = v} & \tcode{T\&} & \tcode{t} & \tcode{t} is equivalent to \tcode{v}, the value of \tcode{v} is unchanged\\
16791679
\end{concepttable}
16801680

1681-
\indextext{requirements!\idxcode{Cpp98Destructible}}
1681+
\indextext{requirements!\idxcode{Cpp17Destructible}}
16821682
\begin{concepttable}{\oldconcept{Destructible} requirements}{destructible}
16831683
{p{1in}p{4.15in}}
16841684
\topline
@@ -1825,7 +1825,7 @@
18251825
denote values of type (possibly \tcode{const}) \tcode{P}, and \tcode{np} denotes
18261826
a value of type (possibly \tcode{const}) \tcode{std::nullptr_t}.
18271827

1828-
\indextext{requirements!\idxcode{Cpp98NullablePointer}}%
1828+
\indextext{requirements!\idxcode{Cpp17NullablePointer}}%
18291829
\begin{concepttable}{\oldconcept{NullablePointer} requirements}{nullablepointer}
18301830
{lll}
18311831
\topline
@@ -1865,7 +1865,7 @@
18651865

18661866
\rSec3[hash.requirements]{\oldconcept{Hash} requirements}
18671867

1868-
\indextext{requirements!\idxcode{Cpp98Hash}}
1868+
\indextext{requirements!\idxcode{Cpp17Hash}}
18691869
\pnum
18701870
A type \tcode{H} meets the \oldconcept{Hash} requirements if:
18711871

@@ -1903,7 +1903,7 @@
19031903

19041904
\rSec3[allocator.requirements]{\oldconcept{Allocator} requirements}
19051905

1906-
\indextext{requirements!\idxcode{Cpp98Allocator}}%
1906+
\indextext{requirements!\idxcode{Cpp17Allocator}}%
19071907
\pnum
19081908
The library describes a standard set of requirements for \term{allocators},
19091909
which are class-type objects that encapsulate the information about an allocation model.

source/macros.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
\newcommand{\commentellip}{\tcode{/* ...\ */}}
318318

319319
%% Concepts
320-
\newcommand{\oldconcept}[1]{\textit{Cpp98#1}}
320+
\newcommand{\oldconcept}[1]{\textit{Cpp17#1}}
321321
\newcommand{\libconcept}[1]{\tcode{#1}}
322322

323323
%% Ranges

source/utilities.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15330,7 +15330,7 @@
1533015330
\rSec2[meta.rqmts]{Requirements}
1533115331

1533215332
\pnum
15333-
A \defn{Cpp98UnaryTypeTrait} describes a property
15333+
A \defn{Cpp17UnaryTypeTrait} describes a property
1533415334
of a type. It shall be a class template that takes one template type
1533515335
argument and, optionally, additional arguments that help define the
1533615336
property being described. It shall be \oldconcept{DefaultConstructible},
@@ -15345,7 +15345,7 @@
1534515345
unambiguously available in the \oldconcept{UnaryTypeTrait}.
1534615346

1534715347
\pnum
15348-
A \defn{Cpp98BinaryTypeTrait} describes a
15348+
A \defn{Cpp17BinaryTypeTrait} describes a
1534915349
relationship between two types. It shall be a class template that
1535015350
takes two template type arguments and, optionally, additional
1535115351
arguments that help define the relationship being described. It shall
@@ -15361,7 +15361,7 @@
1536115361
unambiguously available in the \oldconcept{BinaryTypeTrait}.
1536215362

1536315363
\pnum
15364-
A \defn{Cpp98TransformationTrait}
15364+
A \defn{Cpp17TransformationTrait}
1536515365
modifies a property
1536615366
of a type. It shall be a class template that takes one
1536715367
template type argument and, optionally, additional arguments that help

0 commit comments

Comments
 (0)