Skip to content

Commit dfaea65

Browse files
committed
Fix (even more) test failures in Boost.Algorithm
[SVN r77076]
1 parent eb8291e commit dfaea65

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

include/boost/algorithm/cxx11/is_permutation.hpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,12 @@ bool is_permutation ( ForwardIterator1 first1, ForwardIterator1 last1,
9797
/// We will use the standard one if it is available,
9898
/// otherwise we have our own implementation.
9999
template< class ForwardIterator1, class ForwardIterator2 >
100-
bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last,
101-
ForwardIterator2 first2 )
100+
bool is_permutation ( ForwardIterator1 first, ForwardIterator1 last, ForwardIterator2 first2 )
102101
{
103102
// How should I deal with the idea that ForwardIterator1::value_type
104103
// and ForwardIterator2::value_type could be different? Define my own comparison predicate?
105104
return boost::algorithm::is_permutation ( first, last, first2,
106-
std::equal_to<typename ForwardIterator1::value_type> ());
105+
std::equal_to<typename std::iterator_traits<ForwardIterator1>::value_type> ());
107106
}
108107

109108
#endif

include/boost/algorithm/cxx11/ordered.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ using std::is_sorted; // Section 25.4.1.5
168168
bool is_increasing ( ForwardIterator first, ForwardIterator last )
169169
{
170170
typedef typename std::iterator_traits<ForwardIterator>::value_type value_type;
171-
return is_sorted (first, last, std::less_equal<value_type>());
171+
return boost::algorithm::is_sorted (first, last, std::less_equal<value_type>());
172172
}
173173

174174

include/boost/algorithm/cxx11/partition_copy.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ partition_copy ( InputIterator first, InputIterator last,
5050
*out_true++ = *first;
5151
else
5252
*out_false++ = *first;
53-
return std::make_pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
53+
return std::pair<OutputIterator1, OutputIterator2> ( out_true, out_false );
5454
}
5555
#endif
5656

0 commit comments

Comments
 (0)