From f023127c99d160a557df34e676abd9af6cf00f53 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Sat, 18 Feb 2012 17:26:08 +0000 Subject: [PATCH] Fix some test failures in Boost.Algorithm [SVN r77070] --- include/boost/algorithm/cxx11/ordered.hpp | 18 +++++++++--------- .../boost/algorithm/cxx11/partition_copy.hpp | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/boost/algorithm/cxx11/ordered.hpp b/include/boost/algorithm/cxx11/ordered.hpp index 60f61ee..76d4112 100644 --- a/include/boost/algorithm/cxx11/ordered.hpp +++ b/include/boost/algorithm/cxx11/ordered.hpp @@ -62,7 +62,7 @@ using std::is_sorted; // Section 25.4.1.5 ForwardIterator is_sorted_until ( ForwardIterator first, ForwardIterator last ) { typedef typename std::iterator_traits::value_type value_type; - return is_sorted_until ( first, last, std::less_equal()); + return boost::algorithm::is_sorted_until ( first, last, std::less_equal()); } @@ -76,7 +76,7 @@ using std::is_sorted; // Section 25.4.1.5 template 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 @@ using std::is_sorted; // Section 25.4.1.5 template 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 @@ using std::is_sorted; // Section 25.4.1.5 typename boost::range_iterator >::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 @@ using std::is_sorted; // Section 25.4.1.5 template typename boost::range_iterator::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 @@ using std::is_sorted; // Section 25.4.1.5 template 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 @@ using std::is_sorted; // Section 25.4.1.5 template 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 @@ using std::is_sorted; // Section 25.4.1.5 bool is_decreasing ( ForwardIterator first, ForwardIterator last ) { typedef typename std::iterator_traits::value_type value_type; - return is_sorted (first, last, std::greater_equal()); + return boost::algorithm::is_sorted (first, last, std::greater_equal()); } /// \fn is_decreasing ( const R &range ) @@ -264,7 +264,7 @@ using std::is_sorted; // Section 25.4.1.5 bool is_strictly_decreasing ( ForwardIterator first, ForwardIterator last ) { typedef typename std::iterator_traits::value_type value_type; - return is_sorted (first, last, std::greater()); + return boost::algorithm::is_sorted (first, last, std::greater()); } /// \fn is_strictly_decreasing ( const R &range ) diff --git a/include/boost/algorithm/cxx11/partition_copy.hpp b/include/boost/algorithm/cxx11/partition_copy.hpp index ee854ec..15cce19 100644 --- a/include/boost/algorithm/cxx11/partition_copy.hpp +++ b/include/boost/algorithm/cxx11/partition_copy.hpp @@ -12,6 +12,8 @@ #ifndef BOOST_ALGORITHM_PARTITION_COPY_HPP #define BOOST_ALGORITHM_PARTITION_COPY_HPP +#include // for make_pair + #include #include