diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-09-03 15:56:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-03 15:56:31 +0000 |
| commit | 4254ad78d813b8c4cfc6c07218aee6b1be554f23 (patch) | |
| tree | 8e9350d7e0339c5c7da9499ab5742527e21520c6 /gcc-4.9/libstdc++-v3/include/ext/pb_ds | |
| parent | 9bba04175106d9b9e8a58715e3e7fa560c13e092 (diff) | |
| parent | e97c99f15937e5762a973b25192aab824126a6d3 (diff) | |
| download | toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.gz toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.tar.bz2 toolchain_gcc-4254ad78d813b8c4cfc6c07218aee6b1be554f23.zip | |
Merge "[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch. Merge gcc-4_9 source r214745 from google/gcc-4_9 branch."
Diffstat (limited to 'gcc-4.9/libstdc++-v3/include/ext/pb_ds')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.9/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp b/gcc-4.9/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp index d97b4326a..7ada3656d 100644 --- a/gcc-4.9/libstdc++-v3/include/ext/pb_ds/detail/bin_search_tree_/traits.hpp +++ b/gcc-4.9/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, |