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

Subject: [Boost-commit] svn:boost r48782 - sandbox/committee/concepts/stdlib
From: dgregor_at_[hidden]
Date: 2008-09-14 23:28:46

Author: dgregor
Date: 2008-09-14 23:28:46 EDT (Sun, 14 Sep 2008)
New Revision: 48782
URL: http://svn.boost.org/trac/boost/changeset/48782

Log:
More minor fixes
Text files modified: 
   sandbox/committee/concepts/stdlib/clib-algorithms.tex |    13 +++++++++++++                           
   sandbox/committee/concepts/stdlib/clib-iterators.tex  |    14 +++++++-------                          
   sandbox/committee/concepts/stdlib/clib-utilities.tex  |     8 ++++----                                
   3 files changed, 24 insertions(+), 11 deletions(-)

Modified: sandbox/committee/concepts/stdlib/clib-algorithms.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-algorithms.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-algorithms.tex	2008-09-14 23:28:46 EDT (Sun, 14 Sep 2008)
@@ -445,6 +445,10 @@
     void random_shuffle(Iter @\farg{first}@,
                         Iter @\farg{last}@,
                         Rand&& @\farg{rand}@);
+  @\removedConcepts{template<class RandomAccessIterator, class UniformRandomNumberGenerator>}@
+    @\removedConcepts{void random_shuffle(RandomAccessIterator \mbox{\farg{first}},}@
+                        @\removedConcepts{RandomAccessIterator \mbox{\farg{last}},}@
+                        @\removedConcepts{UniformRandomNumberGenerator\& \mbox{\farg{rand}});}@
 
   @\textcolor{black}{// \ref{alg.partitions}, partitions:}@
   template <InputIterator Iter, Predicate<auto, Iter::value_type> Pred>
@@ -2534,8 +2538,17 @@
   void random_shuffle(Iter @\farg{first}@,
                       Iter @\farg{last}@,
                       Rand&& @\farg{rand}@);
+
+  @\removedConcepts{template<class RandomAccessIterator, class UniformRandomNumberGenerator>}@
+    @\removedConcepts{void random_shuffle(RandomAccessIterator \mbox{\farg{first}},}@
+                        @\removedConcepts{RandomAccessIterator \mbox{\farg{last}},}@
+                        @\removedConcepts{UniformRandomNumberGenerator\& \mbox{\farg{rand}});}@
 \end{itemdecl}\color{black}
 
+\editorial{The third overload of \tcode{random_shuffle} has been
+  removed, since it is ambiguous with the second and we do not have
+  concept constraints for it.}
+
 \begin{itemdescr}
 \pnum
 \effects\ 

Modified: sandbox/committee/concepts/stdlib/clib-iterators.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-iterators.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-iterators.tex	2008-09-14 23:28:46 EDT (Sun, 14 Sep 2008)
@@ -436,7 +436,7 @@
         @\removedConcepts{typename iterator_traits<Iterator>::pointer,}@
         @\removedConcepts{typename iterator_traits<Iterator>::reference>}@ {
   protected:
-    Iterator current;
+    Iter@\removedConcepts{ator}@ current;
   public:
     typedef Iter@\removedConcepts{ator}@ iterator_type;
     @\addedConcepts{typedef Iter::value_type value_type;}@
@@ -1488,7 +1488,7 @@
   template <@\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@>
   class move_iterator {
   public:
-    typedef Iterator                                              iterator_type;
+    typedef Iter@\removedConcepts{ator}@                                              iterator_type;
     typedef @\changedConcepts{typename iterator_traits<Iterator>}{Iter}@::difference_type   difference_type;
     typedef Iterator                                              pointer;
     typedef @\changedConcepts{typename iterator_traits<Iterator>}{Iter}@::value_type        value_type;
@@ -1554,11 +1554,11 @@
     auto operator-(
       const move_iterator<Iter@\removedConcepts{ator}@1>& x, 
       const move_iterator<Iter@\removedConcepts{ator}@2>& y) -> decltype(x.base() - y.base());
-  template <@\changedConcepts{class}{RandomAccessIterator}@ Iterator>
-    move_iterator<Iterator> operator+(
-      @\changedConcepts{typename move_iterator<Iterator>}{Iter}@::difference_type n, const move_iterator<Iterator>& x);
+  template <@\changedConcepts{class}{RandomAccessIterator}@ Iter@\removedConcepts{ator}@>
+    move_iterator<Iter@\removedConcepts{ator}@> operator+(
+      @\changedConcepts{typename move_iterator<Iterator>}{Iter}@::difference_type n, const move_iterator<Iter@\removedConcepts{ator}@>& x);
   template <@\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@>
-    move_iterator<Iter@\removedConcepts{ator}@> make_move_iterator(const Iterator& i);
+    move_iterator<Iter@\removedConcepts{ator}@> make_move_iterator(const Iter@\removedConcepts{ator}@& i);
 
   @\addedConcepts{template<InputIterator Iter>}@
     @\addedConcepts{concept_map InputIterator<move_iterator<Iter> > \{ \}}@
@@ -1891,7 +1891,7 @@
 
 \begin{itemdecl}
 template <@\changedConcepts{class}{InputIterator}@ Iter@\removedConcepts{ator}@>
-move_iterator<Iter@\removedConcepts{ator}@> make_move_iterator(const Iterator& i);
+move_iterator<Iter@\removedConcepts{ator}@> make_move_iterator(const Iter@\removedConcepts{ator}@& i);
 \end{itemdecl}
 
 \begin{itemdescr}

Modified: sandbox/committee/concepts/stdlib/clib-utilities.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-utilities.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-utilities.tex	2008-09-14 23:28:46 EDT (Sun, 14 Sep 2008)
@@ -1948,7 +1948,7 @@
 \index{minus@\tcode{minus}}%
 \begin{itemdecl}
 template <@\changedConcepts{class}{ReferentType}@ T> struct minus : binary_function<T,T,T> {
-  @\addedConcepts{requires HasMinus<T> \&\& Convertible<T::result_type, T>}@
+  @\addedConcepts{requires HasMinus<T,T> \&\& Convertible<T::result_type, T>}@
     T operator()(const T& @\farg{x}@, const T& @\farg{y}@) const;
 };
 \end{itemdecl}
@@ -1963,7 +1963,7 @@
 \index{multiplies@\tcode{multiplies}}%
 \begin{itemdecl}
 template <@\changedConcepts{class}{ReferentType}@ T> struct multiplies : binary_function<T,T,T> {
-  @\addedConcepts{requires HasMultiply<T> \&\& Convertible<T::result_type, T>}@
+  @\addedConcepts{requires HasMultiply<T,T> \&\& Convertible<T::result_type, T>}@
     T operator()(const T& @\farg{x}@, const T& @\farg{y}@) const;
 };
 \end{itemdecl}
@@ -1978,7 +1978,7 @@
 \index{divides@\tcode{divides}}%
 \begin{itemdecl}
 template <@\changedConcepts{class}{ReferentType}@ T> struct divides : binary_function<T,T,T> {
-  @\addedConcepts{requires HasDivide<T> \&\& Convertible<T::result_type, T>}@
+  @\addedConcepts{requires HasDivide<T,T> \&\& Convertible<T::result_type, T>}@
   T operator()(const T& @\farg{x}@, const T& @\farg{y}@) const;
 };
 \end{itemdecl}
@@ -1993,7 +1993,7 @@
 \index{modulus@\tcode{modulus}}%
 \begin{itemdecl}
 template <@\changedConcepts{class}{ReferentType}@ T> struct modulus : binary_function<T,T,T> {
-  @\addedConcepts{requires HasModulus<T> \&\& Convertible<T::result_type, T>}@
+  @\addedConcepts{requires HasModulus<T,T> \&\& Convertible<T::result_type, T>}@
     T operator()(const T& @\farg{x}@, const T& @\farg{y}@) const;
 };
 \end{itemdecl}