From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Wed, 20 Nov 2013 13:39:33 +0000 (+0000)
Subject: re PR c++/59173 (Alias template in partial specialization finds name from primary... 
X-Git-Tag: releases/gcc-4.9.0~2596
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8c370af2c1042d9693baa11c0159a1060575181;p=thirdparty%2Fgcc.git

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
---

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  <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 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<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)); }