[move.iterators] Dissolve single-item subclauses.

Author: jensmaurer

source/iterators.tex

@@ -2150,9 +2150,7 @@
 \oldconcept{BidirectionalIterator} requirements\iref{bidirectional.iterators}
 or \oldconcept{RandomAccessIterator} requirements\iref{random.access.iterators}, respectively.
 
-\rSec3[move.iter.ops]{\tcode{move_iterator} operations}
-
-\rSec4[move.iter.op.const]{\tcode{move_iterator} constructors}
+\rSec3[move.iter.cons]{\tcode{move_iterator} construction and assignment}
 
 \indexlibrary{\idxcode{move_iterator}!constructor}%
 \begin{itemdecl}
@@ -2195,8 +2193,6 @@
 \tcode{Iterator}.
 \end{itemdescr}
 
-\rSec4[move.iter.op=]{\tcode{move_iterator::operator=}}
-
 \indexlibrarymember{operator=}{move_iterator}%
 \begin{itemdecl}
 template<class U> constexpr move_iterator& operator=(const move_iterator<U>& u);
@@ -2212,7 +2208,7 @@
 \tcode{Iterator}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.conv]{\tcode{move_iterator} conversion}
+\rSec3[move.iter.op.conv]{\tcode{move_iterator} conversion}
 
 \indexlibrarymember{base}{move_iterator}%
 \begin{itemdecl}
@@ -2224,7 +2220,7 @@
 \returns \tcode{current}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.star]{\tcode{move_iterator::operator*}}
+\rSec3[move.iter.elem]{\tcode{move_iterator} element access}
 
 \indexlibrarymember{operator*}{move_iterator}%
 \begin{itemdecl}
@@ -2236,8 +2232,6 @@
 \returns \tcode{static_cast<reference>(*current)}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.ref]{\tcode{move_iterator::operator->}}
-
 \indexlibrarymember{operator->}{move_iterator}%
 \begin{itemdecl}
 constexpr pointer operator->() const;
@@ -2248,7 +2242,17 @@
 \returns \tcode{current}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.incr]{\tcode{move_iterator::operator++}}
+\indexlibrarymember{operator[]}{move_iterator}%
+\begin{itemdecl}
+constexpr @\unspec@ operator[](difference_type n) const;
+\end{itemdecl}
+
+\begin{itemdescr}
+\pnum
+\returns \tcode{std::move(current[n])}.
+\end{itemdescr}
+
+\rSec3[move.iter.nav]{\tcode{move_iterator} navigation}
 
 \indexlibrarymember{operator++}{move_iterator}%
 \begin{itemdecl}
@@ -2279,8 +2283,6 @@
 \end{codeblock}
 \end{itemdescr}
 
-\rSec4[move.iter.op.decr]{\tcode{move_iterator::operator-{-}}}
-
 \indexlibrarymember{operator\dcr}{move_iterator}%
 \begin{itemdecl}
 constexpr move_iterator& operator--();
@@ -2310,8 +2312,6 @@
 \end{codeblock}
 \end{itemdescr}
 
-\rSec4[move.iter.op.+]{\tcode{move_iterator::operator+}}
-
 \indexlibrarymember{operator+}{move_iterator}%
 \begin{itemdecl}
 constexpr move_iterator operator+(difference_type n) const;
@@ -2322,8 +2322,6 @@
 \returns \tcode{move_iterator(current + n)}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.+=]{\tcode{move_iterator::operator+=}}
-
 \indexlibrarymember{operator+=}{move_iterator}%
 \begin{itemdecl}
 constexpr move_iterator& operator+=(difference_type n);
@@ -2337,8 +2335,6 @@
 \returns \tcode{*this}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.-]{\tcode{move_iterator::operator-}}
-
 \indexlibrarymember{operator-}{move_iterator}%
 \begin{itemdecl}
 constexpr move_iterator operator-(difference_type n) const;
@@ -2349,8 +2345,6 @@
 \returns \tcode{move_iterator(current - n)}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.-=]{\tcode{move_iterator::operator-=}}
-
 \indexlibrarymember{operator-=}{move_iterator}%
 \begin{itemdecl}
 constexpr move_iterator& operator-=(difference_type n);
@@ -2364,19 +2358,7 @@
 \returns \tcode{*this}.
 \end{itemdescr}
 
-\rSec4[move.iter.op.index]{\tcode{move_iterator::operator[]}}
-
-\indexlibrarymember{operator[]}{move_iterator}%
-\begin{itemdecl}
-constexpr @\unspec@ operator[](difference_type n) const;
-\end{itemdecl}
-
-\begin{itemdescr}
-\pnum
-\returns \tcode{std::move(current[n])}.
-\end{itemdescr}
-
-\rSec4[move.iter.op.comp]{\tcode{move_iterator} comparisons}
+\rSec3[move.iter.op.comp]{\tcode{move_iterator} comparisons}
 
 \indexlibrarymember{operator==}{move_iterator}%
 \begin{itemdecl}
@@ -2444,7 +2426,7 @@
 \returns \tcode{!(x < y)}.
 \end{itemdescr}
 
-\rSec4[move.iter.nonmember]{\tcode{move_iterator} non-member functions}
+\rSec3[move.iter.nonmember]{\tcode{move_iterator} non-member functions}
 
 \indexlibrarymember{operator-}{move_iterator}%
 \begin{itemdecl}

source/xrefdelta.tex

@@ -103,6 +103,23 @@
 
 \removedxref{reverse.iter.ops}
 
+% Single-item [move.iterators] subclauses were dissolved.
+\movedxref{move.iter.op=}{move.iter.cons}
+\movedxref{move.iter.op.const}{move.iter.cons}
+
+\movedxref{move.iter.op.star}{move.iter.elem}
+\movedxref{move.iter.op.ref}{move.iter.elem}
+\movedxref{move.iter.op.index}{move.iter.elem}
+
+\movedxref{move.iter.op.+}{move.iter.nav}
+\movedxref{move.iter.op.-}{move.iter.nav}
+\movedxref{move.iter.op.incr}{move.iter.nav}
+\movedxref{move.iter.op.+=}{move.iter.nav}
+\movedxref{move.iter.op.decr}{move.iter.nav}
+\movedxref{move.iter.op.-=}{move.iter.nav}
+
+\removedxref{move.iter.ops}
+
 % Individual swap sections were removed.
 \removedxref{deque.special}
 \removedxref{forwardlist.special}