From: Francesco Biscani <bluescarni@gmail.com>
Date: Wed, 9 Jan 2008 11:12:11 +0000 (+0000)
Subject: hashtable (_Hashtable): Fix friend declaration of __detail::_Map_base<>.
X-Git-Tag: releases/gcc-4.3.0~681
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51631813373a8784613b024dd9b517708803d3d9;p=thirdparty%2Fgcc.git

hashtable (_Hashtable): Fix friend declaration of __detail::_Map_base<>.

2008-01-09  Francesco Biscani  <bluescarni@gmail.com>

	* include/tr1_impl/hashtable (_Hashtable): Fix friend declaration
	of __detail::_Map_base<>.

From-SVN: r131424
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b507039944d6..52e18378a78c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-09  Francesco Biscani  <bluescarni@gmail.com>
+
+	* include/tr1_impl/hashtable (_Hashtable): Fix friend declaration
+	of __detail::_Map_base<>.
+
 2008-01-08  Paolo Carlini  <pcarlini@suse.de>
 
 	* testsuite/22_locale/global_templates/user_facet_hierarchies.cc: Do
diff --git a/libstdc++-v3/include/tr1_impl/hashtable b/libstdc++-v3/include/tr1_impl/hashtable
index 0efe6520a281..9a3ecbd094fb 100644
--- a/libstdc++-v3/include/tr1_impl/hashtable
+++ b/libstdc++-v3/include/tr1_impl/hashtable
@@ -168,7 +168,8 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
 						  __cache_hash_code>
                                                           const_iterator;
 
-      template<typename _Key2, typename _Pair, typename _Hashtable>
+      template<typename _Key2, typename _Value2, typename _Ex2, bool __unique2,
+	       typename _Hashtable2>
         friend struct __detail::_Map_base;
 
     private: