Skip to content

Commit a580378

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

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
@@ -1593,7 +1593,7 @@
15931593
\tcode{T()} shall be a well-defined expression\iref{dcl.init} if one of those
15941594
signatures is called using the default argument\iref{dcl.fct.default}.
15951595

1596-
\indextext{requirements!\idxcode{Cpp98EqualityComparable}}%
1596+
\indextext{requirements!\idxcode{Cpp17EqualityComparable}}%
15971597
\begin{concepttable}{\oldconcept{EqualityComparable} requirements}{equalitycomparable}
15981598
{x{1in}x{1in}p{3in}}
15991599
\topline
@@ -1612,7 +1612,7 @@
16121612
\end{itemize} \\
16131613
\end{concepttable}
16141614

1615-
\indextext{requirements!\idxcode{Cpp98LessThanComparable}}%
1615+
\indextext{requirements!\idxcode{Cpp17LessThanComparable}}%
16161616
\begin{concepttable}{\oldconcept{LessThanComparable} requirements}{lessthancomparable}
16171617
{x{1in}x{1in}p{3in}}
16181618
\topline
@@ -1623,7 +1623,7 @@
16231623
\end{concepttable}
16241624

16251625
\enlargethispage{-3\baselineskip}
1626-
\indextext{requirements!\idxcode{Cpp98DefaultConstructible}}%
1626+
\indextext{requirements!\idxcode{Cpp17DefaultConstructible}}%
16271627
\begin{concepttable}{\oldconcept{DefaultConstructible} requirements}{defaultconstructible}
16281628
{x{2.15in}p{3in}}
16291629
\topline
@@ -1634,7 +1634,7 @@
16341634
or aggregate-initialized \\
16351635
\end{concepttable}
16361636

1637-
\indextext{requirements!\idxcode{Cpp98MoveConstructible}}%
1637+
\indextext{requirements!\idxcode{Cpp17MoveConstructible}}%
16381638
\begin{concepttable}{\oldconcept{MoveConstructible} requirements}{moveconstructible}
16391639
{p{1in}p{4.15in}}
16401640
\topline
@@ -1649,7 +1649,7 @@
16491649
work as specified whether \tcode{rv} has been moved from or not. \end{note}}\\
16501650
\end{concepttable}
16511651

1652-
\indextext{requirements!\idxcode{Cpp98CopyConstructible}}%
1652+
\indextext{requirements!\idxcode{Cpp17CopyConstructible}}%
16531653
\begin{concepttable}{\oldconcept{CopyConstructible} requirements (in addition to \oldconcept{MoveConstructible})}{copyconstructible}
16541654
{p{1in}p{4.15in}}
16551655
\topline
@@ -1659,7 +1659,7 @@
16591659
the value of \tcode{v} is unchanged and is equivalent to \tcode{T(v)} \\
16601660
\end{concepttable}
16611661

1662-
\indextext{requirements!\idxcode{Cpp98MoveAssignable}}%
1662+
\indextext{requirements!\idxcode{Cpp17MoveAssignable}}%
16631663
\begin{concepttable}{\oldconcept{MoveAssignable} requirements}{moveassignable}
16641664
{p{1in}p{1in}p{1in}p{1.9in}}
16651665
\topline
@@ -1675,15 +1675,15 @@
16751675
work as specified whether \tcode{rv} has been moved from or not. \end{note}}\\
16761676
\end{concepttable}
16771677

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

1686-
\indextext{requirements!\idxcode{Cpp98Destructible}}
1686+
\indextext{requirements!\idxcode{Cpp17Destructible}}
16871687
\begin{concepttable}{\oldconcept{Destructible} requirements}{destructible}
16881688
{p{1in}p{4.15in}}
16891689
\topline
@@ -1830,7 +1830,7 @@
18301830
denote values of type (possibly \tcode{const}) \tcode{P}, and \tcode{np} denotes
18311831
a value of type (possibly \tcode{const}) \tcode{std::nullptr_t}.
18321832

1833-
\indextext{requirements!\idxcode{Cpp98NullablePointer}}%
1833+
\indextext{requirements!\idxcode{Cpp17NullablePointer}}%
18341834
\begin{concepttable}{\oldconcept{NullablePointer} requirements}{nullablepointer}
18351835
{lll}
18361836
\topline
@@ -1870,7 +1870,7 @@
18701870

18711871
\rSec3[hash.requirements]{\oldconcept{Hash} requirements}
18721872

1873-
\indextext{requirements!\idxcode{Cpp98Hash}}
1873+
\indextext{requirements!\idxcode{Cpp17Hash}}
18741874
\pnum
18751875
A type \tcode{H} meets the \oldconcept{Hash} requirements if:
18761876

@@ -1908,7 +1908,7 @@
19081908

19091909
\rSec3[allocator.requirements]{\oldconcept{Allocator} requirements}
19101910

1911-
\indextext{requirements!\idxcode{Cpp98Allocator}}%
1911+
\indextext{requirements!\idxcode{Cpp17Allocator}}%
19121912
\pnum
19131913
The library describes a standard set of requirements for \term{allocators},
19141914
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
@@ -15319,7 +15319,7 @@
1531915319
\rSec2[meta.rqmts]{Requirements}
1532015320

1532115321
\pnum
15322-
A \defn{Cpp98UnaryTypeTrait} describes a property
15322+
A \defn{Cpp17UnaryTypeTrait} describes a property
1532315323
of a type. It shall be a class template that takes one template type
1532415324
argument and, optionally, additional arguments that help define the
1532515325
property being described. It shall be \oldconcept{DefaultConstructible},
@@ -15334,7 +15334,7 @@
1533415334
unambiguously available in the \oldconcept{UnaryTypeTrait}.
1533515335

1533615336
\pnum
15337-
A \defn{Cpp98BinaryTypeTrait} describes a
15337+
A \defn{Cpp17BinaryTypeTrait} describes a
1533815338
relationship between two types. It shall be a class template that
1533915339
takes two template type arguments and, optionally, additional
1534015340
arguments that help define the relationship being described. It shall
@@ -15350,7 +15350,7 @@
1535015350
unambiguously available in the \oldconcept{BinaryTypeTrait}.
1535115351

1535215352
\pnum
15353-
A \defn{Cpp98TransformationTrait}
15353+
A \defn{Cpp17TransformationTrait}
1535415354
modifies a property
1535515355
of a type. It shall be a class template that takes one
1535615356
template type argument and, optionally, additional arguments that help

0 commit comments

Comments
 (0)