summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/tr1_impl/hashtable3
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b507039944d..52e18378a78 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 0efe6520a28..9a3ecbd094f 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: