aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2013-11-20 13:39:33 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2013-11-20 13:39:33 +0000
commitf8c370af2c1042d9693baa11c0159a1060575181 (patch)
tree18f8723781bde49c59e09defb39dae9428c4ab7a
parent063d671d599f010838cd3731df0b8da4b28ecac5 (diff)
downloadgcc-f8c370af2c1042d9693baa11c0159a1060575181.zip
gcc-f8c370af2c1042d9693baa11c0159a1060575181.tar.gz
gcc-f8c370af2c1042d9693baa11c0159a1060575181.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/ext/pointer.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f372d62..e989a0d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-20 Jonathan Wakely <jwakely.gcc@gmail.com>
+
+ PR c++/59173
+ * include/ext/pointer.h (pointer_traits<>::rebind<>): Add template
+ keyword in nested name.
+
2013-11-20 David Edelsohn <dje.gcc@gmail.com>
* 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 12bc749..d1730be 100644
--- a/libstdc++-v3/include/ext/pointer.h
+++ b/libstdc++-v3/include/ext/pointer.h
@@ -580,7 +580,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Up>
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)); }