diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2014-06-10 19:09:18 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2014-06-10 19:09:18 +0100 |
| commit | 060269c481f8678f6a88b1d4c57a6aaef858fc71 (patch) | |
| tree | 5b336e56826482ac1c758dbe49b6aa33c842e5d5 /libstdc++-v3 | |
| parent | d7256bb835ab4fa75aa88924795a866dbf803a6f (diff) | |
| download | gcc-060269c481f8678f6a88b1d4c57a6aaef858fc71.zip gcc-060269c481f8678f6a88b1d4c57a6aaef858fc71.tar.gz gcc-060269c481f8678f6a88b1d4c57a6aaef858fc71.tar.bz2 | |
re PR libstdc++/61390 (error in nested template parameter in ext/pb_ds header file)
PR libstdc++/61390
* include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
(bin_search_tree_traits): Do not redeclare template-parameters.
* testsuite/util/testsuite_iterators.h (test_container): Likewise.
From-SVN: r211421
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/testsuite_iterators.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0ea3bb9..6368e04 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2014-06-10 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/61390 + * include/ext/pb_ds/detail/bin_search_tree_/traits.hpp + (bin_search_tree_traits): Do not redeclare template-parameters. + * testsuite/util/testsuite_iterators.h (test_container): Likewise. + 2014-06-09 Jonathan Wakely <jwakely@redhat.com> * doc/Makefile.am: Add missing file. Use generate.consistent.ids diff --git a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp index d97b432..7ada365 100644 --- a/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp +++ b/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp @@ -55,7 +55,7 @@ namespace __gnu_pbds class Cmp_Fn, template<typename Node_CItr, class Node_Itr, - class Cmp_Fn, + class _Cmp_Fn, typename _Alloc> class Node_Update, class Node, @@ -161,7 +161,7 @@ namespace __gnu_pbds class Cmp_Fn, template<typename Node_CItr, class Node_Itr, - class Cmp_Fn, + class _Cmp_Fn, typename _Alloc> class Node_Update, class Node, diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index c690581..6cf18b4 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -518,7 +518,7 @@ namespace __gnu_test * It takes two pointers representing a range and presents them as * a container of iterators. */ - template <class T, template<class T> class ItType> + template <class T, template<class TT> class ItType> struct test_container { typename ItType<T>::ContainerType bounds; |