diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 18:50:25 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-04 18:50:25 +0000 |
| commit | c24a96544407b64a987d4df76b4ce47490ece413 (patch) | |
| tree | 064934b884d7beaf7eafc90c7c5e123e83c0ca04 /libstdc++-v3/include/ext | |
| parent | c8c43ed8f2731f8c5334d78fb5b8ab96d6300fc6 (diff) | |
| download | ppe42-gcc-c24a96544407b64a987d4df76b4ce47490ece413.tar.gz ppe42-gcc-c24a96544407b64a987d4df76b4ce47490ece413.zip | |
Backported from mainline
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@213603 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext')
| -rw-r--r-- | libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 d97b4326af4..7ada3656dfc 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, |
