[class.static.data] Cleanup description for local/unnamed classes.

Author: jensmaurer

source/classes.tex

@@ -2791,6 +2791,12 @@
 \tcode{thread_local} there is one copy of the data member that is shared by all
 the objects of the class.
 
+\pnum
+A static data member shall not be \tcode{mutable}\iref{dcl.stc}.
+A static data member shall not be a direct member\iref{class.mem}
+of an unnamed\iref{class.pre} or local\iref{class.local} class or
+of a (possibly indirectly) nested class\iref{class.nest} thereof.
+
 \pnum
 \indextext{initialization!static member}%
 \indextext{definition!static member}%
@@ -2858,25 +2864,17 @@
 There is exactly one definition of a static data member
 that is odr-used\iref{basic.def.odr} in a valid program.
 \end{note}
-Unnamed classes and classes contained directly
-or indirectly within unnamed classes shall not contain static
-data members.
 
 \pnum
 \begin{note}
 Static data members of a class in namespace scope have the linkage of the name of the class\iref{basic.link}.
-A local class cannot have static data members\iref{class.local}.
 \end{note}
 
 \pnum
 Static data members are initialized and destroyed exactly like
 non-local variables~(\ref{basic.start.static}, \ref{basic.start.dynamic},
 \ref{basic.start.term}).
 
-\pnum
-A static data member shall not be
-\tcode{mutable}\iref{dcl.stc}.
-
 \rSec2[class.bit]{Bit-fields}%
 \indextext{bit-field}
 
@@ -3403,7 +3401,9 @@
 
 \pnum
 \indextext{restriction!static member local class}%
-A local class shall not have static data members.
+\begin{note}
+A local class cannot have static data members\iref{class.static.data}.
+\end{note}
 
 \rSec1[class.derived]{Derived classes}%
 \indextext{derived class|(}