CWG2448 Cv-qualification of arithmetic types and deprecation of volatile

Author: jensmaurer

source/basic.tex

@@ -5014,9 +5014,10 @@
 Types
 \keyword{bool},
 \keyword{char}, \keyword{wchar_t},
-\keyword{char8_t}, \keyword{char16_t}, \keyword{char32_t},
-and the signed and unsigned integer types are
-collectively called
+\keyword{char8_t}, \keyword{char16_t}, \keyword{char32_t}, and
+the signed and unsigned integer types,
+and cv-qualified versions\iref{basic.type.qualifier} thereof,
+are collectively termed
 \defnx{integral types}{integral type}.
 A synonym for integral type is \defn{integer type}.
 \begin{note}
@@ -5027,19 +5028,26 @@
 
 \pnum
 \indextext{floating-point type|see{type, floating-point}}%
-There are three \defnx{floating-point types}{type!floating-point}:
+The three distinct types
 \indextext{type!\idxcode{float}}%
 \keyword{float},
 \indextext{type!\idxcode{double}}%
 \keyword{double},
 and
 \indextext{type!\idxcode{long double}}%
-\tcode{\keyword{long} \keyword{double}}. The type \keyword{double} provides at least as much
+\tcode{\keyword{long} \keyword{double}}
+can represent floating-point numbers.
+The type \keyword{double} provides at least as much
 precision as \keyword{float}, and the type \tcode{\keyword{long} \keyword{double}} provides at
 least as much precision as \keyword{double}. The set of values of the type
 \keyword{float} is a subset of the set of values of the type
 \keyword{double}; the set of values of the type \keyword{double} is a subset
-of the set of values of the type \tcode{\keyword{long} \keyword{double}}. The value
+of the set of values of the type \tcode{\keyword{long} \keyword{double}}.
+The types
+\keyword{float}, \keyword{double}, and \tcode{\keyword{long} \keyword{double}},
+and cv-qualified versions\iref{basic.type.qualifier} thereof,
+are collectively termed \defnx{floating-point types}{type!floating-point}.
+The value
 representation of floating-point types is \impldef{value representation of
 floating-point types}.
 \indextext{floating-point type!implementation-defined}%
@@ -5048,7 +5056,7 @@
 floating-point operations; see also~\ref{support.limits}.
 \end{note}
 Integral and floating-point types are collectively
-called \defnx{arithmetic}{type!arithmetic} types.
+termed \defnx{arithmetic types}{type!arithmetic}.
 \indextext{\idxcode{numeric_limits}!specializations for arithmetic types}%
 Specializations of the standard library template
 \tcode{std::numeric_limits}\iref{support.limits} shall specify the
@@ -5267,18 +5275,22 @@
 \indextext{cv-qualifier}%
 \indextext{\idxcode{const}}%
 \indextext{\idxcode{volatile}}%
-A type mentioned in~\ref{basic.fundamental} and~\ref{basic.compound} is
-a \defnadj{cv-unqualified}{type}. Each type which is a
-cv-unqualified object type or is
-\keyword{void}\iref{basic.types} has three corresponding cv-qualified
-versions of its type: a \defn{const-qualified} version, a
-\defn{volatile-qualified} version, and a
-\defn{const-volatile-qualified} version. The
-type of an object\iref{intro.object} includes the \grammarterm{cv-qualifier}{s}
-specified in the \grammarterm{decl-specifier-seq}\iref{dcl.spec},
-\grammarterm{declarator}\iref{dcl.decl},
-\grammarterm{type-id}\iref{dcl.name}, or
-\grammarterm{new-type-id}\iref{expr.new} when the object is created.
+Each type other than a function or reference type
+is part of a group of four distinct, but related, types:
+a \defn{cv-unqualified} version,
+a \defn{const-qualified} version,
+a \defn{volatile-qualified} version, and
+a \defn{const-volatile-qualified} version.
+The types in each such group shall have
+the same representation and alignment requirements\iref{basic.align}.
+\begin{footnote}
+The same representation and alignment requirements
+are meant to imply interchangeability as
+arguments to functions,
+return values from functions, and
+non-static data members of unions.
+\end{footnote}
+A function or reference type is always cv-unqualified.
 \begin{itemize}
 \item A \defnadj{const}{object} is an object of type \tcode{\keyword{const} T} or a
   non-mutable subobject of a const object.
@@ -5291,16 +5303,15 @@
   a const subobject of a volatile object, or a non-mutable volatile
   subobject of a const object.
 \end{itemize}
-The cv-qualified or
-cv-unqualified versions of a type
-are distinct types; however, they shall have the same representation and
-alignment requirements\iref{basic.align}.
-\begin{footnote}
-The same representation
-and alignment requirements are meant to imply
-interchangeability as arguments to functions, return values from
-functions, and non-static data members of unions.
-\end{footnote}
+\begin{note}
+The type of an object\iref{intro.object} includes
+the \grammarterm{cv-qualifier}s specified in the
+\grammarterm{decl-specifier-seq}\iref{dcl.spec},
+\grammarterm{declarator}\iref{dcl.decl},
+\grammarterm{type-id}\iref{dcl.name}, or
+\grammarterm{new-type-id}\iref{expr.new}
+when the object is created.
+\end{note}
 
 \pnum
 Except for array types, a compound type\iref{basic.compound} is not cv-qualified by the

source/overloading.tex

@@ -3409,7 +3409,7 @@
 \indextext{type!arithmetic!promoted}%
 In this subclause, the term
 \defn{promoted integral type}
-is used to refer to those integral types which are preserved by
+is used to refer to those cv-unqualified integral types which are preserved by
 integral promotion\iref{conv.prom} (including e.g.
 \tcode{int}
 and
@@ -3432,53 +3432,20 @@
 \cvqual{vq}),
 where
 \tcode{\placeholder{T}}
-is an arithmetic type other than \tcode{bool},
+is a cv-unqualified arithmetic type other than \tcode{bool}
+or a cv-unqualified pointer to (possibly cv-qualified) object type,
 there exist candidate operator functions of the form
 \begin{codeblock}
 @\cvqual{vq} \placeholder{T}@& operator++(@\cvqual{vq} \placeholder{T}@&);
 @\placeholder{T}@ operator++(@\cvqual{vq} \placeholder{T}@&, int);
-\end{codeblock}
-
-\pnum
-For every pair
-(\tcode{\placeholder{T}},
-\cvqual{vq}),
-where
-\tcode{\placeholder{T}}
-is an arithmetic type other than
-\tcode{bool},
-there exist candidate operator functions of the form
-\begin{codeblock}
 @\cvqual{vq} \placeholder{T}@& operator--(@\cvqual{vq} \placeholder{T}@&);
 @\placeholder{T}@ operator--(@\cvqual{vq} \placeholder{T}@&, int);
 \end{codeblock}
 
 \pnum
-For every pair
-(\tcode{\placeholder{T}},
-\cvqual{vq}),
-where
-\tcode{\placeholder{T}}
-is a cv-qualified or cv-unqualified object type,
-there exist candidate operator functions of the form
-\begin{codeblock}
-@\placeholder{T}@*@\cvqual{vq}@& operator++(@\placeholder{T}@*@\cvqual{vq}@&);
-@\placeholder{T}@*@\cvqual{vq}@& operator--(@\placeholder{T}@*@\cvqual{vq}@&);
-@\placeholder{T}@*    operator++(@\placeholder{T}@*@\cvqual{vq}@&, int);
-@\placeholder{T}@*    operator--(@\placeholder{T}@*@\cvqual{vq}@&, int);
-\end{codeblock}
-
-\pnum
-For every cv-qualified or cv-unqualified object type
-\tcode{\placeholder{T}},
-there exist candidate operator functions of the form
-\begin{codeblock}
-@\placeholder{T}@&    operator*(@\placeholder{T}@*);
-\end{codeblock}
-
-\pnum
-For every function type
-\tcode{\placeholder{T}} that does not have cv-qualifiers or a \grammarterm{ref-qualifier},
+For every (possibly cv-qualified) object type \tcode{\placeholder{T}} and
+for every function type \tcode{\placeholder{T}}
+that has neither \grammarterm{cv-qualifier}s nor a \grammarterm{ref-qualifier},
 there exist candidate operator functions of the form
 \begin{codeblock}
 @\placeholder{T}@&    operator*(@\placeholder{T}@*);
@@ -3491,7 +3458,7 @@
 \end{codeblock}
 
 \pnum
-For every floating-point or promoted integral type \tcode{\placeholder{T}},
+For every cv-unqualified floating-point or promoted integral type \tcode{\placeholder{T}},
 there exist candidate operator functions of the form
 \begin{codeblock}
 @\placeholder{T}@ operator+(@\placeholder{T}@);