[vector.bool.pspc] Break out into its own subclause

This change is consistent with specification of nested classes
elsewhere in the standard, and allows better use of qualified
names in the declaration of member functions in their own
specification.

Author: AlisdairM

source/containers.tex

@@ -8064,18 +8064,18 @@
     allocator_type get_allocator() const noexcept;
 
     // iterators
-    iterator               begin() noexcept;
-    const_iterator         begin() const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end() const noexcept;
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
+    iterator                begin() noexcept;
+    const_iterator          begin() const noexcept;
+    iterator                end() noexcept;
+    const_iterator          end() const noexcept;
+    reverse_iterator        rbegin() noexcept;
+    const_reverse_iterator  rbegin() const noexcept;
+    reverse_iterator        rend() noexcept;
+    const_reverse_iterator  rend() const noexcept;
+    const_iterator          cbegin() const noexcept;
+    const_iterator          cend() const noexcept;
+    const_reverse_iterator  crbegin() const noexcept;
+    const_reverse_iterator  crend() const noexcept;
 
     // \ref{hive.capacity}, capacity
     bool empty() const noexcept;
@@ -10489,21 +10489,8 @@
     using reverse_iterator       = std::reverse_iterator<iterator>;
     using const_reverse_iterator = std::reverse_iterator<const_iterator>;
 
-    // bit reference
-    class @\libmember{reference}{vector<bool>}@ {
-    public:
-      constexpr reference(const reference& x) noexcept;
-      constexpr ~reference();
-      constexpr reference& operator=(bool x) noexcept;
-      constexpr reference& operator=(const reference& x) noexcept;
-      constexpr const reference& operator=(bool x) const noexcept;
-      constexpr operator bool() const noexcept;
-      constexpr void flip() noexcept;   // flips the bit
-
-      friend constexpr void swap(reference x, reference y) noexcept;
-      friend constexpr void swap(reference x, bool& y) noexcept;
-      friend constexpr void swap(bool& x, reference y) noexcept;
-    };
+    // \ref{vector.bool.reference}, bit reference
+    class reference;
 
     // construct/copy/destroy
     constexpr vector() noexcept(noexcept(Allocator())) : vector(Allocator()) { }
@@ -10607,13 +10594,34 @@
 of \tcode{bool} values. A space-optimized representation of bits is
 recommended instead.
 
+\rSec3[vector.bool.reference]{Class \tcode{vector<bool>::reference}}%
 \pnum
 \tcode{reference}
 is a class that simulates a reference to a single bit in the sequence.
 
+\indexlibrarymember{reference}{vector<bool>}%
+\begin{codeblock}
+namespace std {
+  template<size_t N> class vector<bool>::reference {
+    public:
+      constexpr reference(const reference& x) noexcept;
+      constexpr ~reference();
+      constexpr reference& operator=(bool x) noexcept;
+      constexpr reference& operator=(const reference& x) noexcept;
+      constexpr const reference& operator=(bool x) const noexcept;
+      constexpr operator bool() const noexcept;
+      constexpr void flip() noexcept;   // flips the bit
+
+      friend constexpr void swap(reference x, reference y) noexcept;
+      friend constexpr void swap(reference x, bool& y) noexcept;
+      friend constexpr void swap(bool& x, reference y) noexcept;
+  };
+}
+\end{codeblock}
+
 \indexlibraryctor{vector<bool>::reference}%
 \begin{itemdecl}
-constexpr reference::reference(const reference& x) noexcept;
+constexpr reference(const reference& x) noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -10624,7 +10632,7 @@
 
 \indexlibrarydtor{vector<bool>::reference}%
 \begin{itemdecl}
-constexpr reference::~reference();
+constexpr ~reference();
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -10635,9 +10643,9 @@
 
 \indexlibrarymember{operator=}{vector<bool>::reference}%
 \begin{itemdecl}
-constexpr reference& reference::operator=(bool x) noexcept;
-constexpr reference& reference::operator=(const reference& x) noexcept;
-constexpr const reference& reference::operator=(bool x) const noexcept;
+constexpr reference& operator=(bool x) noexcept;
+constexpr reference& operator=(const reference& x) noexcept;
+constexpr const reference& operator=(bool x) const noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -10653,7 +10661,7 @@
 
 \indexlibrarymember{flip}{vector<bool>::reference}%
 \begin{itemdecl}
-constexpr void reference::flip() noexcept;
+constexpr void flip() noexcept;
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -10681,7 +10689,7 @@
 \end{codeblock}
 \end{itemdescr}
 
-
+\rSec3[vector.bool.members]{\tcode{vector<bool>} members}
 
 \indexlibrarymember{flip}{vector<bool>}%
 \begin{itemdecl}
@@ -11525,7 +11533,7 @@
 
   template<class Key, class T, class Compare, class Allocator>
     constexpr void swap(multimap<Key, T, Compare, Allocator>& x,
-                        multimap<Key, T, Compare, Allocator>& y)
+              multimap<Key, T, Compare, Allocator>& y)
       noexcept(noexcept(x.swap(y)));
 
   // \ref{multimap.erasure}, erasure for \tcode{multimap}
@@ -26063,7 +26071,7 @@
     \tcode{j...[$\rho$]} is equal to the sum of
     \begin{itemize}
     \item
-      the lower bound of the \tcode{submdspan} slice range of \tcode{valid_slices...[$\rho$]}
+      the lower bound of the submdspan slice range of \tcode{valid_slices...[$\rho$]}
       for extent $\rho$ of \tcode{m.extents()}, and
     \item
       zero if the type of \tcode{valid_slices...[$\rho$]} is a collapsing slice type,