From f8c370af2c1042d9693baa11c0159a1060575181 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 20 Nov 2013 13:39:33 +0000 Subject: [PATCH] re PR c++/59173 (Alias template in partial specialization finds name from primary template) PR c++/59173 * include/ext/pointer.h (pointer_traits<>::rebind<>): Add template keyword in nested name. From-SVN: r205114 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/ext/pointer.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f372d62dcbcc..e989a0d1471d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2013-11-20 Jonathan Wakely + + PR c++/59173 + * include/ext/pointer.h (pointer_traits<>::rebind<>): Add template + keyword in nested name. + 2013-11-20 David Edelsohn * testsuite/17_intro/static.cc: Ignore AIX TOC reload warnings. diff --git a/libstdc++-v3/include/ext/pointer.h b/libstdc++-v3/include/ext/pointer.h index 12bc749c063e..d1730be07f24 100644 --- a/libstdc++-v3/include/ext/pointer.h +++ b/libstdc++-v3/include/ext/pointer.h @@ -580,7 +580,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template using rebind = typename __gnu_cxx::_Pointer_adapter< - typename pointer_traits<_Storage_policy>::rebind<_Up>>; + typename pointer_traits<_Storage_policy>::template rebind<_Up>>; static pointer pointer_to(typename pointer::reference __r) noexcept { return pointer(std::addressof(__r)); }