diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2696be70fb4..cf4cb7148b3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2009-09-24 Johannes Singler + + * include/parallel/base.h (_EqualFromLess): Move _Compare template + parameter to the end as of others. + * include/parallel/algobase.h + (__lexicographical_compare_switch): Likewise. + 2009-09-23 Johannes Singler * include/parallel/algobase.h: Uglify internal identifiers; diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h index 77578a56999..df1c58bedb6 100644 --- a/libstdc++-v3/include/parallel/algobase.h +++ b/libstdc++-v3/include/parallel/algobase.h @@ -198,7 +198,7 @@ namespace __parallel typedef typename _TraitsType2::value_type _ValueType2; typedef __gnu_parallel:: - _EqualFromLess<_Predicate, _ValueType1, _ValueType2> + _EqualFromLess<_ValueType1, _ValueType2, _Predicate> _EqualFromLessCompare; // Longer sequence in first place. diff --git a/libstdc++-v3/include/parallel/base.h b/libstdc++-v3/include/parallel/base.h index 70f85ba600f..b70c7337686 100644 --- a/libstdc++-v3/include/parallel/base.h +++ b/libstdc++-v3/include/parallel/base.h @@ -154,8 +154,7 @@ template /** @brief Constructs predicate for equality from strict weak * ordering predicate */ -// XXX comparator at the end, as per others -template +template class _EqualFromLess : public std::binary_function<_T1, _T2, bool> { private: