2009-09-24 Johannes Singler <singler@ira.uka.de>

        * include/parallel/base.h (_EqualFromLess):  Move _Compare template
        parameter to the end as of others.
        * include/parallel/algobase.h
        (__lexicographical_compare_switch): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152112 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2696be7..cf4cb71 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-24  Johannes Singler  <singler@ira.uka.de>
+
+        * 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  <singler@ira.uka.de>
 
         * include/parallel/algobase.h: Uglify internal identifiers;

diff --git a/libstdc++-v3/include/parallel/algobase.h b/libstdc++-v3/include/parallel/algobase.h
index 77578a5..df1c58b 100644 (file)
--- 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 70f85ba..b70c733 100644 (file)
--- a/libstdc++-v3/include/parallel/base.h
+++ b/libstdc++-v3/include/parallel/base.h
@@ -154,8 +154,7 @@ template<typename _Tp>
 /** @brief Constructs predicate for equality from strict weak
   *  ordering predicate
   */
-// XXX comparator at the end, as per others
-template<typename _Compare, typename _T1, typename _T2>
+template<typename _T1, typename _T2, typename _Compare>
   class _EqualFromLess : public std::binary_function<_T1, _T2, bool>
   {
   private: