diff options
| author | Johannes Singler <singler@ira.uka.de> | 2009-09-24 07:40:37 +0000 |
|---|---|---|
| committer | Johannes Singler <singler@gcc.gnu.org> | 2009-09-24 07:40:37 +0000 |
| commit | 2a2e7f9dc51414d782982e3633c9e6df18e2a71e (patch) | |
| tree | fec0b25f42eb9404a570113cb3d42992260aac27 | |
| parent | 7f7d7fa6735a5d2ee43c0f45c3efd99acbd40aae (diff) | |
| download | gcc-2a2e7f9dc51414d782982e3633c9e6df18e2a71e.zip gcc-2a2e7f9dc51414d782982e3633c9e6df18e2a71e.tar.gz gcc-2a2e7f9dc51414d782982e3633c9e6df18e2a71e.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/algobase.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/base.h | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2696be7..cf4cb71 100644 --- 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 --- 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 --- 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: |