diff options
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f0c957da3f1..54d1482bdea 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2008-12-12 H.J. Lu <hongjiu.lu@intel.com> + + Backport from mainline: + 2008-12-12 H.J. Lu <hongjiu.lu@intel.com> + + PR libstdc++/37144 + * testsuite/util/regression/trait/assoc/type_trait.hpp + (regression_test_type_traits): Add const to pair_type_rebind. + 2008-12-11 Jakub Jelinek <jakub@redhat.com> PR c++/37582 diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp index 5c0682de38f..e517edaff32 100644 --- a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp +++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp @@ -87,7 +87,7 @@ namespace __gnu_pbds typedef typename basic_type_rebind::const_reference basic_type_const_reference; - typedef typename cntnr::allocator::template rebind<std::pair<basic_type, basic_type> >::other pair_type_rebind; + typedef typename cntnr::allocator::template rebind<std::pair<const basic_type, basic_type> >::other pair_type_rebind; typedef typename pair_type_rebind::const_reference pair_type_const_reference; template<typename Gen> |