OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jonathan Wakely 2014-06-10 19:09:18 +01:00 committed by Jonathan Wakely
parent d7256bb835
commit 060269c481
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -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

4
libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp
View File

@ -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,

2
libstdc++-v3/testsuite/util/testsuite_iterators.h
View File

@ -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;