[Boost-commit] svn:boost r48242 - sandbox/committee/concepts/stdlib

From: dgregor_at_[hidden]
Date: 2008-08-19 23:36:13

Author: dgregor
Date: 2008-08-19 23:36:12 EDT (Tue, 19 Aug 2008)
New Revision: 48242
URL: http://svn.boost.org/trac/boost/changeset/48242

Log:
Update advance, distance, next, prior
Text files modified: 
   sandbox/committee/concepts/stdlib/clib-iterators.tex |    33 ++++++++++++++++++++++-----------       
   1 files changed, 22 insertions(+), 11 deletions(-)

Modified: sandbox/committee/concepts/stdlib/clib-iterators.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-iterators.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-iterators.tex	2008-08-19 23:36:12 EDT (Tue, 19 Aug 2008)
@@ -285,10 +285,18 @@
 
 \index{advance@\tcode{advance}}%
 \begin{itemdecl}
-template <class InputIterator, class Distance>
-  void advance(InputIterator& i, Distance n);
+template <@\changedConcepts{class InputIterator}{InputIterator Iter}@@\removedConcepts{, class Distance}@>
+  void advance(@\changedConcepts{InputIterator}{Iter}@& i, @\changedConcepts{Distance}{Iter::difference_type}@ n);
+@\addedConcepts{template <BidirectionalIterator Iter>}@
+  @\addedConcepts{void advance(Iter\& i, Iter::difference_type n);}@
+@\addedConcepts{template <RandomAccessIterator Iter>}@
+  @\addedConcepts{void advance(Iter\& i, Iter::difference_type n);}@
 \end{itemdecl}
 
+\editorial{Note that we have eliminated the \tcode{Distance} parameter
+  in favor of the \tcode{difference_type} of the iterator, which more
+  accurately reflects how the iterator can move.}
+
 \begin{itemdescr}
 \pnum
 \requires\ 
@@ -307,9 +315,12 @@
 
 \index{distance@\tcode{distance}}%
 \begin{itemdecl}
-  template<class InputIterator>
-      typename iterator_traits<InputIterator>::difference_type
-         distance(InputIterator first, InputIterator last);
+template <@\changedConcepts{class InputIterator}{InputIterator Iter}@>
+  @\changedConcepts{typename iterator_traits<InputIterator>::difference_type}{Iter::difference_type}@
+  distance(@\changedConcepts{InputIterator}{Iter}@ first, @\changedConcepts{InputIterator}{Iter}@ last);
+@\addedConcepts{template <RandomAccessIterator Iter>}@
+  @\addedConcepts{Iter::difference_type}@
+  @\addedConcepts{distance(Iter first, Iter last);}@
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -329,9 +340,9 @@
 
 \index{next@\tcode{next}}%
 \begin{itemdecl}
-template <class InputIterator>
-  InputIterator next(InputIterator x,
-    typename std::iterator_traits<InputIterator>::difference_type n = 1);
+template <@\changedConcepts{class InputIterator}{InputIterator Iter}@>
+  @\changedConcepts{InputIterator}{Iter}@ next(@\changedConcepts{InputIterator}{Iter}@ x,
+    @\changedConcepts{typename std::iterator_traits<InputIterator>::difference_type}{Iter::difference_type}@ n = 1);
 \end{itemdecl}
 
 \begin{itemdescr}
@@ -341,9 +352,9 @@
 
 \index{prev@\tcode{prev}}%
 \begin{itemdecl}
-template <class BidirectionalIterator>
-  BidirectionalIterator prev(BidirectionalIterator x,
-    typename std::iterator_traits<BidirectionalIterator>::difference_type n = 1);
+template <@\changedConcepts{class BidirectionalIterator}{BidirectionalIterator Iter}@>
+  @\changedConcepts{BidirectionalIterator}{Iter}@ prev(@\changedConcepts{BidirectionalIterator}{Iter}@ x,
+    @\changedConcepts{typename std::iterator_traits<BidirectionalIterator>::difference_type}{Iter::difference_type}@ n = 1);
 \end{itemdecl}
 
 \begin{itemdescr}