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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0ea3bb970fd12e1825944618b8ad01828c7314f9..6368e042140e3b7a793c719d112ca4cdd614a4fb 100644 (file)
--- 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 d97b4326af4f0c0448e9320bfa5b1537e85c297a..7ada3656dfcf20d153dfd3d38f8c16cfccdb1b41 100644 (file)
--- 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 c6905811cd336e534a75e4bf26ff87c1a764b29a..6cf18b4007a54bb4597d1e9820767ec33ffa755c 100644 (file)
--- 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;