base.h (_EqualFromLess): Move _Compare template parameter to the end as of others.

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.

From-SVN: r152112

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2696be70fb42a99b8c0d4f75655b1ccd56f20e46..cf4cb7148b32959d4feb7dcaef29f573741b8269 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 77578a569992f9f086e6cbc510de248952fd5ed4..df1c58bedb6f2b9cce82a9f1d1c3e4ec1d568c58 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 70f85ba600f827f0f8479b0e852e83f0d9b4cdae..b70c7337686913a74e33cdcdab74cce2c657f013 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: