Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r77070 - trunk/boost/algorithm/cxx11
From: marshall_at_[hidden]
Date: 2012-02-18 12:26:08


Author: marshall
Date: 2012-02-18 12:26:08 EST (Sat, 18 Feb 2012)
New Revision: 77070
URL: http://svn.boost.org/trac/boost/changeset/77070

Log:
Fix some test failures in Boost.Algorithm
Text files modified:
   trunk/boost/algorithm/cxx11/ordered.hpp | 18 +++++++++---------
   trunk/boost/algorithm/cxx11/partition_copy.hpp | 2 ++
   2 files changed, 11 insertions(+), 9 deletions(-)

Modified: trunk/boost/algorithm/cxx11/ordered.hpp
==============================================================================
--- trunk/boost/algorithm/cxx11/ordered.hpp (original)
+++ trunk/boost/algorithm/cxx11/ordered.hpp 2012-02-18 12:26:08 EST (Sat, 18 Feb 2012)
@@ -62,7 +62,7 @@
     ForwardIterator is_sorted_until ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
- return is_sorted_until ( first, last, std::less_equal<value_type>());
+ return boost::algorithm::is_sorted_until ( first, last, std::less_equal<value_type>());
     }
 
 
@@ -76,7 +76,7 @@
     template <typename ForwardIterator, typename Pred>
     bool is_sorted ( ForwardIterator first, ForwardIterator last, Pred p )
     {
- return is_sorted_until (first, last, p) == last;
+ return boost::algorithm::is_sorted_until (first, last, p) == last;
     }
 
 /// \fn is_sorted ( ForwardIterator first, ForwardIterator last )
@@ -88,7 +88,7 @@
     template <typename ForwardIterator>
     bool is_sorted ( ForwardIterator first, ForwardIterator last )
     {
- return is_sorted_until (first, last) == last;
+ return boost::algorithm::is_sorted_until (first, last) == last;
     }
 #endif
 
@@ -109,7 +109,7 @@
         typename boost::range_iterator<const R>
>::type is_sorted_until ( const R &range, Pred p )
     {
- return is_sorted_until ( boost::begin ( range ), boost::end ( range ), p );
+ return boost::algorithm::is_sorted_until ( boost::begin ( range ), boost::end ( range ), p );
     }
 
 
@@ -121,7 +121,7 @@
     template <typename R>
     typename boost::range_iterator<const R>::type is_sorted_until ( const R &range )
     {
- return is_sorted_until ( boost::begin ( range ), boost::end ( range ));
+ return boost::algorithm::is_sorted_until ( boost::begin ( range ), boost::end ( range ));
     }
 
 
@@ -135,7 +135,7 @@
     template <typename R, typename Pred>
     bool is_sorted ( const R &range, Pred p )
     {
- return is_sorted ( boost::begin ( range ), boost::end ( range ), p );
+ return boost::algorithm::is_sorted ( boost::begin ( range ), boost::end ( range ), p );
     }
 
 
@@ -147,7 +147,7 @@
     template <typename R, typename Pred>
     bool is_sorted ( const R &range )
     {
- return is_sorted ( boost::begin ( range ), boost::end ( range ));
+ return boost::algorithm::is_sorted ( boost::begin ( range ), boost::end ( range ));
     }
 
 
@@ -201,7 +201,7 @@
     bool is_decreasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
- return is_sorted (first, last, std::greater_equal<value_type>());
+ return boost::algorithm::is_sorted (first, last, std::greater_equal<value_type>());
     }
 
 /// \fn is_decreasing ( const R &range )
@@ -264,7 +264,7 @@
     bool is_strictly_decreasing ( ForwardIterator first, ForwardIterator last )
     {
         typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
- return is_sorted (first, last, std::greater<value_type>());
+ return boost::algorithm::is_sorted (first, last, std::greater<value_type>());
     }
 
 /// \fn is_strictly_decreasing ( const R &range )

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-18 12:26:08 EST (Sat, 18 Feb 2012)
@@ -12,6 +12,8 @@
 #ifndef BOOST_ALGORITHM_PARTITION_COPY_HPP
 #define BOOST_ALGORITHM_PARTITION_COPY_HPP
 
+#include <utility> // for make_pair
+
 #include <boost/range/begin.hpp>
 #include <boost/range/end.hpp>
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk