CWG1511 const volatile variables and the one-definition rule

Author: Stefanus Du Toit

source/basic.tex

@@ -399,12 +399,11 @@
 the definition of \tcode{D}, or shall refer to the same entity, after
 overload resolution~(\ref{over.match}) and after matching of partial
 template specialization~(\ref{temp.over}), except that a name can refer
-to a \tcode{const} object with internal or no linkage if the object has
-the same literal type in all definitions of \tcode{D},
+to a non-volatile \tcode{const} object with internal or no linkage if the
+object has the same literal type in all definitions of \tcode{D},
 and the object is initialized with a constant
-expression~(\ref{expr.const}), and the value (but not the address) of
-the object is used, and the object has the same value in all definitions
-of \tcode{D}; and
+expression~(\ref{expr.const}), and the object is not odr-used, and the object
+has the same value in all definitions of \tcode{D}; and
 \item in each definition of \tcode{D}, corresponding entities shall have the
 same language linkage; and
 \item in each definition of \tcode{D}, the overloaded operators referred
@@ -2207,9 +2206,9 @@
 \item a variable, function or function template that is
 explicitly declared \tcode{static}; or,
 
-\item a variable that is explicitly declared \tcode{const} or \tcode{constexpr}
-and neither explicitly declared \tcode{extern} nor previously declared
-to have external linkage; or
+\item a non-volatile variable that is explicitly declared \tcode{const} or
+\tcode{constexpr} and neither explicitly declared \tcode{extern} nor previously
+declared to have external linkage; or
 
 \item a data member of an anonymous union.
 \end{itemize}