[Boost-commit] svn:boost r77076 - trunk/boost/algorithm/cxx11

Subject: [Boost-commit] svn:boost r77076 - trunk/boost/algorithm/cxx11
From: marshall_at_[hidden]
Date: 2012-02-20 10:22:05

Author: marshall
Date: 2012-02-20 10:22:04 EST (Mon, 20 Feb 2012)
New Revision: 77076
URL: http://svn.boost.org/trac/boost/changeset/77076

Log:
Fix (even more) test failures in Boost.Algorithm
Text files modified: 
   trunk/boost/algorithm/cxx11/is_permutation.hpp |     5 ++---                                   
   trunk/boost/algorithm/cxx11/ordered.hpp        |     2 +-                                      
   trunk/boost/algorithm/cxx11/partition_copy.hpp |     2 +-                                      
   3 files changed, 4 insertions(+), 5 deletions(-)

Modified: trunk/boost/algorithm/cxx11/is_permutation.hpp
==============================================================================
--- trunk/boost/algorithm/cxx11/is_permutation.hpp	(original)
+++ trunk/boost/algorithm/cxx11/is_permutation.hpp	2012-02-20 10:22:04 EST (Mon, 20 Feb 2012)
@@ -97,13 +97,12 @@
 ///  We will use the standard one if it is available,
 ///     otherwise we have our own implementation.
 template< class ForwardIterator1, class ForwardIterator2 >
-bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last,
-                            ForwardIterator2 first2 )
+bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 )
 {
 //  How should I deal with the idea that ForwardIterator1::value_type
 //  and ForwardIterator2::value_type could be different? Define my own comparison predicate?
     return boost::algorithm::is_permutation ( first, last, first2,
-                          std::equal_to<typename ForwardIterator1::value_type> ());
+                          std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
 }
 
 #endif

Modified: trunk/boost/algorithm/cxx11/ordered.hpp
==============================================================================
--- trunk/boost/algorithm/cxx11/ordered.hpp	(original)
+++ trunk/boost/algorithm/cxx11/ordered.hpp	2012-02-20 10:22:04 EST (Mon, 20 Feb 2012)
@@ -168,7 +168,7 @@
     bool is_increasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
-        return is_sorted (first, last, std::less_equal<value_type>());
+        return boost::algorithm::is_sorted (first, last, std::less_equal<value_type>());
     }
 
 

Modified: trunk/boost/algorithm/cxx11/partition_copy.hpp
==============================================================================
--- trunk/boost/algorithm/cxx11/partition_copy.hpp	(original)
+++ trunk/boost/algorithm/cxx11/partition_copy.hpp	2012-02-20 10:22:04 EST (Mon, 20 Feb 2012)
@@ -50,7 +50,7 @@
             *out_true++ = *first;
         else
             *out_false++ = *first;
-    return std::make_pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
+    return std::pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
 }
 #endif