Skip to content

Commit bf3327a

Browse files
jensmaurertkoeppe
authored andcommitted
Use \cv{}, not \cv\ . (#1066)
1 parent 7810140 commit bf3327a

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

source/basic.tex

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3610,7 +3610,7 @@
36103610
\defnx{incompletely-defined object type}{object type!incompletely-defined}.%
36113611
\footnote{The size and layout of an instance of an incompletely-defined
36123612
object type is unknown.}
3613-
Incompletely-defined object types and \cv\ \tcode{void} are
3613+
Incompletely-defined object types and \cv{} \tcode{void} are
36143614
\defnx{incomplete types}{type!incomplete}~(\ref{basic.fundamental}).
36153615
Objects shall not be defined to have an
36163616
incomplete type.
@@ -3665,7 +3665,7 @@
36653665
\pnum
36663666
\indextext{object~type}%
36673667
An \defn{object type} is a (possibly cv-qualified) type that is not
3668-
a function type, not a reference type, and not \cv\ \tcode{void}.
3668+
a function type, not a reference type, and not \cv{} \tcode{void}.
36693669

36703670
\pnum
36713671
Arithmetic types~(\ref{basic.fundamental}), enumeration types, pointer
@@ -3930,19 +3930,19 @@
39303930

39313931
\pnum
39323932
\indextext{type!\idxcode{void}}%
3933-
A type \cv\ \tcode{void}
3933+
A type \cv{} \tcode{void}
39343934
is an incomplete type that cannot be completed; such a type has
39353935
an empty set of values. It is used as the return
39363936
type for functions that do not return a value. Any expression can be
3937-
explicitly converted to type \cv\ \tcode{void}~(\ref{expr.cast}).
3938-
An expression of type \cv\ \tcode{void} shall
3937+
explicitly converted to type \cv{} \tcode{void}~(\ref{expr.cast}).
3938+
An expression of type \cv{} \tcode{void} shall
39393939
be used only as an expression statement~(\ref{stmt.expr}), as an operand
39403940
of a comma expression~(\ref{expr.comma}), as a second or third operand
39413941
of \tcode{?:}~(\ref{expr.cond}), as the operand of
39423942
\tcode{typeid}, \tcode{noexcept}, or \tcode{decltype}, as
39433943
the expression in a return statement~(\ref{stmt.return}) for a function
3944-
with the return type \cv\ \tcode{void}, or as the operand of an explicit conversion
3945-
to type \cv\ \tcode{void}.
3944+
with the return type \cv{} \tcode{void}, or as the operand of an explicit conversion
3945+
to type \cv{} \tcode{void}.
39463946

39473947
\pnum
39483948
A value of type \tcode{std::nullptr_t} is a null pointer
@@ -3968,7 +3968,7 @@
39683968
\item \defnx{functions}{type!function}, which have parameters of given types and return
39693969
\tcode{void} or references or objects of a given type,~\ref{dcl.fct};
39703970

3971-
\item \defnx{pointers}{type!pointer} to \cv\ \tcode{void} or objects or functions (including
3971+
\item \defnx{pointers}{type!pointer} to \cv{} \tcode{void} or objects or functions (including
39723972
static members of classes) of a given type,~\ref{dcl.ptr};
39733973

39743974
\item %
@@ -4013,7 +4013,7 @@
40134013

40144014
\pnum
40154015
\indextext{terminology!pointer}%
4016-
The type of a pointer to \cv\ \tcode{void} or a pointer to an object type is
4016+
The type of a pointer to \cv{} \tcode{void} or a pointer to an object type is
40174017
called an \defn{object pointer type}. \begin{note} A pointer to \tcode{void}
40184018
does not have a pointer-to-object type, however, because \tcode{void} is not
40194019
an object type. \end{note} The type of a pointer that can designate a function
@@ -4108,9 +4108,9 @@
41084108
\tcode{void}
41094109
can be used to point to objects of
41104110
unknown type. Such a pointer shall be able to hold any object pointer.
4111-
An object of type \cv\
4111+
An object of type \cv{}
41124112
\tcode{void*} shall have the same representation and alignment
4113-
requirements as \cv\ \tcode{char*}.
4113+
requirements as \cv{} \tcode{char*}.
41144114

41154115
\rSec2[basic.type.qualifier]{CV-qualifiers}
41164116

@@ -4187,7 +4187,7 @@
41874187
represents an arbitrary set of cv-qualifiers, i.e., one of
41884188
\{\tcode{const}\}, \{\tcode{volatile}\}, \{\tcode{const},
41894189
\tcode{volatile}\}, or the empty set.
4190-
For a type \cv\ \tcode{T}, the \defnx{top-level cv-qualifiers}{cv-qualifier!top-level}
4190+
For a type \cv{} \tcode{T}, the \defnx{top-level cv-qualifiers}{cv-qualifier!top-level}
41914191
of that type are those denoted by \cv.
41924192
\begin{example}
41934193
The type corresponding to the \grammarterm{type-id}

source/declarators.tex

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -805,9 +805,9 @@
805805
\indextext{reference collapsing}%
806806
If a \grammarterm{typedef-name}~(\ref{dcl.typedef}, \ref{temp.param})
807807
or a \grammarterm{decltype-specifier}~(\ref{dcl.type.simple}) denotes a type \tcode{TR} that
808-
is a reference to a type \tcode{T}, an attempt to create the type ``lvalue reference to \cv\
808+
is a reference to a type \tcode{T}, an attempt to create the type ``lvalue reference to \cv{}
809809
\tcode{TR}'' creates the type ``lvalue reference to \tcode{T}'', while an attempt to create
810-
the type ``rvalue reference to \cv\ \tcode{TR}'' creates the type \tcode{TR}. \begin{example}
810+
the type ``rvalue reference to \cv{} \tcode{TR}'' creates the type \tcode{TR}. \begin{example}
811811

812812
\begin{codeblock}
813813
int i;
@@ -2338,12 +2338,12 @@
23382338
\tcode{v}$_0$, \tcode{v}$_1$, \tcode{v}$_2$, ...
23392339
of the
23402340
\grammarterm{identifier-list} as names~(\ref{basic.scope.declarative}).
2341-
Let \cv\ denote the
2341+
Let \cv{} denote the
23422342
\grammarterm{cv-qualifier}{s} in the \grammarterm{decl-specifier-seq}. First, a
23432343
variable with a unique name \tcode{e} is introduced. If the
23442344
\grammarterm{assignment-expression} in the \grammarterm{brace-or-equal-initializer}
23452345
has array type \tcode{A} and no \grammarterm{ref-qualifier} is present, \tcode{e}
2346-
has type \cv\ \tcode{A} and each element is copy-initialized or direct-initialized
2346+
has type \cv{} \tcode{A} and each element is copy-initialized or direct-initialized
23472347
from the corresponding element of the \grammarterm{assignment-expression} as specified
23482348
by the form of the \grammarterm{brace-or-equal-initializer}. Otherwise, \tcode{e}
23492349
is defined as-if by
@@ -2407,8 +2407,8 @@
24072407
(in declaration order),
24082408
each \tcode{v}$_i$ is the
24092409
name of an lvalue that refers to the member \tcode{m}$_i$ of \tcode{e} and
2410-
whose type is \cv\ \tcode{T}$_i$, where \tcode{T}$_i$ is the declared type of
2411-
that member; the referenced type is \cv\ \tcode{T}$_i$. The lvalue is a
2410+
whose type is \cv{} \tcode{T}$_i$, where \tcode{T}$_i$ is the declared type of
2411+
that member; the referenced type is \cv{} \tcode{T}$_i$. The lvalue is a
24122412
bit-field if that member is a bit-field.
24132413
\begin{example}
24142414
\begin{codeblock}

source/exceptions.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,9 +733,9 @@
733733
A type denoted
734734
in a \grammarterm{dynamic-exception-specification}
735735
shall not denote a pointer or reference to an incomplete type, other than
736-
``pointer to \cv\ \tcode{void}''.
736+
``pointer to \cv{} \tcode{void}''.
737737
A type
738-
\cv\ \tcode{T}
738+
\cv{} \tcode{T}
739739
denoted in a \grammarterm{dynamic-exception-specification}
740740
is adjusted to type \tcode{T}.
741741
A type

source/expressions.tex

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,7 @@
18941894
the value obtained is a copy of the original value
18951895
\end{note}
18961896
The operand shall be a modifiable lvalue. The type of the operand shall
1897-
be an arithmetic type other than \cv\ \tcode{bool},
1897+
be an arithmetic type other than \cv{} \tcode{bool},
18981898
or a pointer to a complete object type. The value
18991899
of the operand object is modified by adding \tcode{1} to it.
19001900
The
@@ -2232,7 +2232,7 @@
22322232
\tcode{static_cast}.
22332233

22342234
\pnum
2235-
Any expression can be explicitly converted to type \cv\
2235+
Any expression can be explicitly converted to type \cv{}
22362236
\tcode{void}, in which case it becomes a discarded-value
22372237
expression (Clause~\ref{expr}).
22382238
\begin{note}
@@ -2277,7 +2277,7 @@
22772277

22782278
\pnum
22792279
A value of a scoped enumeration type~(\ref{dcl.enum}) can be explicitly converted to an
2280-
integral type. When that type is \cv\ \tcode{bool}, the resulting value is
2280+
integral type. When that type is \cv{} \tcode{bool}, the resulting value is
22812281
\tcode{false} if the original value is zero and \tcode{true} for all other
22822282
values. For the remaining integral types, the value is unchanged if the
22832283
original value can be represented by the
@@ -2454,7 +2454,7 @@
24542454
the overall
24552455
restriction that a \tcode{reinterpret_cast} cannot cast away constness.}
24562456
When a prvalue \tcode{v} of object pointer type is converted to
2457-
the object pointer type ``pointer to \cv\ \tcode{T}'', the result is \tcode{static_cast<\cv\ T*>(static_cast<\cv\
2457+
the object pointer type ``pointer to \cv{} \tcode{T}'', the result is \tcode{static_cast<\cv{} T*>(static_cast<\cv{}
24582458
void*>(v))}.
24592459
\begin{note}
24602460
Converting a prvalue of type ``pointer to \tcode{T1}'' to
@@ -2720,7 +2720,7 @@
27202720
Otherwise, if the type of the expression is \tcode{T}, the result has type ``pointer to
27212721
\tcode{T}'' and is a prvalue that is the address of the designated object~(\ref{intro.memory})
27222722
or a pointer to the designated function. \begin{note} In particular, the address of an
2723-
object of type ``\cv\ \tcode{T}'' is ``pointer to \cv\ \tcode{T}'', with the same
2723+
object of type ``\cv{} \tcode{T}'' is ``pointer to \cv{} \tcode{T}'', with the same
27242724
cv-qualification. \end{note}
27252725
For purposes of pointer arithmetic~(\ref{expr.add}) and
27262726
comparison~(\ref{expr.rel}, \ref{expr.eq}),
@@ -2834,7 +2834,7 @@
28342834
is modified by adding \tcode{1}.
28352835
\indextext{prefix~\tcode{\dcr}}%
28362836
The operand shall be a modifiable lvalue. The type of the operand shall
2837-
be an arithmetic type other than \cv\ \tcode{bool},
2837+
be an arithmetic type other than \cv{} \tcode{bool},
28382838
or a pointer to a completely-defined object type.
28392839
The result is the updated operand; it is an lvalue, and it is a
28402840
bit-field if the operand is a bit-field.
@@ -4080,7 +4080,7 @@
40804080

40814081
\pnum
40824082
For addition or subtraction, if the expressions \tcode{P} or \tcode{Q} have
4083-
type ``pointer to \cv\ \tcode{T}'', where \tcode{T} and the array element type
4083+
type ``pointer to \cv{} \tcode{T}'', where \tcode{T} and the array element type
40844084
are not similar~(\ref{conv.qual}), the behavior is undefined.
40854085
\begin{note} In particular, a pointer to a base class cannot be used for
40864086
pointer arithmetic when the array contains objects of a derived class type.

source/statements.tex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -799,14 +799,14 @@
799799
The \grammarterm{expr-or-braced-init-list}
800800
of a return statement is called its operand. A return statement with
801801
no operand shall be used only in a function whose return type is
802-
\cv\ \tcode{void}, a constructor~(\ref{class.ctor}), or a
802+
\cv{} \tcode{void}, a constructor~(\ref{class.ctor}), or a
803803
destructor~(\ref{class.dtor}).
804804
\indextext{\idxcode{return}!constructor~and}%
805805
\indextext{\idxcode{return}!constructor~and}%
806806
A return statement with an operand of type \tcode{void} shall be used only
807-
in a function whose return type is \cv\ \tcode{void}.
807+
in a function whose return type is \cv{} \tcode{void}.
808808
A return statement with any other operand shall be used only
809-
in a function whose return type is not \cv\ \tcode{void};
809+
in a function whose return type is not \cv{} \tcode{void};
810810
\indextext{conversion!return~type}%
811811
the return statement initializes the
812812
glvalue result or prvalue result object of the (explicit or implicit) function call
@@ -828,7 +828,7 @@
828828
Flowing off the end of
829829
a constructor,
830830
a destructor, or
831-
a function with a \cv\ \tcode{void} return type is
831+
a function with a \cv{} \tcode{void} return type is
832832
equivalent to a \tcode{return} with no operand.
833833
Otherwise, flowing off the end of a function
834834
other than \tcode{main}~(\ref{basic.start.main})

0 commit comments

Comments
 (0)