This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [v3] more consistent api testing
Hi Benjamin,
only a quick reply on a point...
Yes, it's just the undocumented extra parameter. We should at least
document this....
Yes, is my vote. I think we should conform to the interfaces as
specified... or change the specified interfaces.... :)
This is a portability issue, as people using the GNU TR1 interfaces
could conceivably have specializations that don't compile on
TR1-conformant systems.
Agreed. I will commit the below when final testing finishes...
Paolo.
/////////////////
2007-02-21 Paolo Carlini <pcarlini@suse.de>
* include/tr1/unordered_map (class __unordered_map,
class __unordered_multimap): New.
(class unordered_map, class unordered_multimap): Forward to
the latter.
* include/tr1/unordered_set: Likewise for unordered_set and
unordered_multiset.
* testsuite/tr1/6_containers/headers/unordered_set/synopsis.cc:
Remove xfail.
* testsuite/tr1/6_containers/headers/unordered_map/synopsis.cc:
Likewise.
* testsuite/tr1/6_containers/unordered_multimap/requirements/
explicit_instantiation.cc: Adjust.
* testsuite/tr1/6_containers/unordered_set/requirements/
explicit_instantiation.cc: Likewise.
* testsuite/tr1/6_containers/unordered_map/requirements/
explicit_instantiation.cc: Likewise.
* testsuite/tr1/6_containers/unordered_multiset/requirements/
explicit_instantiation.cc: Likewise.
* testsuite/tr1/6_containers/unordered_map/24064.cc: Likewise.
* testsuite/util/native_type/assoc/native_hash_set.hpp: Likewise.
* testsuite/util/native_type/assoc/native_hash_map.hpp: Likewise.
Index: include/tr1/unordered_map
===================================================================
--- include/tr1/unordered_map (revision 122175)
+++ include/tr1/unordered_map (working copy)
@@ -48,7 +48,7 @@
class _Pred = std::equal_to<_Key>,
class _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
bool __cache_hash_code = false>
- class unordered_map
+ class __unordered_map
: public _Hashtable<_Key, std::pair<const _Key, _Tp>, _Alloc,
std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
_Hash, __detail::_Mod_range_hashing,
@@ -71,21 +71,21 @@
typedef typename _Base::allocator_type allocator_type;
explicit
- unordered_map(size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_map(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(),
__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
{ }
template<typename _InputIterator>
- unordered_map(_InputIterator __f, _InputIterator __l,
- size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_map(_InputIterator __f, _InputIterator __l,
+ size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(),
__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
@@ -97,7 +97,7 @@
class _Pred = std::equal_to<_Key>,
class _Alloc = std::allocator<std::pair<const _Key, _Tp> >,
bool __cache_hash_code = false>
- class unordered_multimap
+ class __unordered_multimap
: public _Hashtable<_Key, std::pair<const _Key, _Tp>,
_Alloc,
std::_Select1st<std::pair<const _Key, _Tp> >, _Pred,
@@ -122,10 +122,10 @@
typedef typename _Base::allocator_type allocator_type;
explicit
- unordered_multimap(size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_multimap(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(),
__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
@@ -133,11 +133,11 @@
template<typename _InputIterator>
- unordered_multimap(_InputIterator __f, _InputIterator __l,
- typename _Base::size_type __n = 0,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_multimap(_InputIterator __f, _InputIterator __l,
+ typename _Base::size_type __n = 0,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(),
__eql, std::_Select1st<std::pair<const _Key, _Tp> >(), __a)
@@ -147,21 +147,89 @@
template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc,
bool __cache_hash_code>
inline void
- swap(unordered_map<_Key, _Tp, _Hash, _Pred,
+ swap(__unordered_map<_Key, _Tp, _Hash, _Pred,
_Alloc, __cache_hash_code>& __x,
- unordered_map<_Key, _Tp, _Hash, _Pred,
+ __unordered_map<_Key, _Tp, _Hash, _Pred,
_Alloc, __cache_hash_code>& __y)
{ __x.swap(__y); }
template<class _Key, class _Tp, class _Hash, class _Pred, class _Alloc,
bool __cache_hash_code>
inline void
- swap(unordered_multimap<_Key, _Tp, _Hash, _Pred,
+ swap(__unordered_multimap<_Key, _Tp, _Hash, _Pred,
_Alloc, __cache_hash_code>& __x,
- unordered_multimap<_Key, _Tp, _Hash, _Pred,
+ __unordered_multimap<_Key, _Tp, _Hash, _Pred,
_Alloc, __cache_hash_code>& __y)
{ __x.swap(__y); }
+
+ template<class _Key, class _Tp,
+ class _Hash = hash<_Key>,
+ class _Pred = std::equal_to<_Key>,
+ class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
+ class unordered_map
+ : public __unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>
+ {
+ typedef __unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc> _Base;
+
+ public:
+ typedef typename _Base::size_type size_type;
+ typedef typename _Base::hasher hasher;
+ typedef typename _Base::key_equal key_equal;
+ typedef typename _Base::allocator_type allocator_type;
+
+ explicit
+ unordered_map(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__n, __hf, __eql, __a)
+ { }
+
+ template<typename _InputIterator>
+ unordered_map(_InputIterator __f, _InputIterator __l,
+ size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__f, __l, __n, __hf, __eql, __a)
+ { }
+ };
+
+ template<class _Key, class _Tp,
+ class _Hash = hash<_Key>,
+ class _Pred = std::equal_to<_Key>,
+ class _Alloc = std::allocator<std::pair<const _Key, _Tp> > >
+ class unordered_multimap
+ : public __unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>
+ {
+ typedef __unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc> _Base;
+
+ public:
+ typedef typename _Base::size_type size_type;
+ typedef typename _Base::hasher hasher;
+ typedef typename _Base::key_equal key_equal;
+ typedef typename _Base::allocator_type allocator_type;
+
+ explicit
+ unordered_multimap(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__n, __hf, __eql, __a)
+ { }
+
+
+ template<typename _InputIterator>
+ unordered_multimap(_InputIterator __f, _InputIterator __l,
+ typename _Base::size_type __n = 0,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__f, __l, __n, __hf, __eql, __a)
+ { }
+ };
+
_GLIBCXX_END_NAMESPACE
}
Index: include/tr1/unordered_set
===================================================================
--- include/tr1/unordered_set (revision 122175)
+++ include/tr1/unordered_set (working copy)
@@ -48,7 +48,7 @@
class _Pred = std::equal_to<_Value>,
class _Alloc = std::allocator<_Value>,
bool __cache_hash_code = false>
- class unordered_set
+ class __unordered_set
: public _Hashtable<_Value, _Value, _Alloc,
std::_Identity<_Value>, _Pred,
_Hash, __detail::_Mod_range_hashing,
@@ -71,21 +71,21 @@
typedef typename _Base::allocator_type allocator_type;
explicit
- unordered_set(size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_set(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(), __eql,
std::_Identity<_Value>(), __a)
{ }
template<typename _InputIterator>
- unordered_set(_InputIterator __f, _InputIterator __l,
- size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_set(_InputIterator __f, _InputIterator __l,
+ size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(), __eql,
std::_Identity<_Value>(), __a)
@@ -97,7 +97,7 @@
class _Pred = std::equal_to<_Value>,
class _Alloc = std::allocator<_Value>,
bool __cache_hash_code = false>
- class unordered_multiset
+ class __unordered_multiset
: public _Hashtable<_Value, _Value, _Alloc,
std::_Identity<_Value>, _Pred,
_Hash, __detail::_Mod_range_hashing,
@@ -120,10 +120,10 @@
typedef typename _Base::allocator_type allocator_type;
explicit
- unordered_multiset(size_type __n = 10,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_multiset(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(), __eql,
std::_Identity<_Value>(), __a)
@@ -131,11 +131,11 @@
template<typename _InputIterator>
- unordered_multiset(_InputIterator __f, _InputIterator __l,
- typename _Base::size_type __n = 0,
- const hasher& __hf = hasher(),
- const key_equal& __eql = key_equal(),
- const allocator_type& __a = allocator_type())
+ __unordered_multiset(_InputIterator __f, _InputIterator __l,
+ typename _Base::size_type __n = 0,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
: _Base(__f, __l, __n, __hf, __detail::_Mod_range_hashing(),
__detail::_Default_ranged_hash(), __eql,
std::_Identity<_Value>(), __a)
@@ -145,21 +145,89 @@
template<class _Value, class _Hash, class _Pred, class _Alloc,
bool __cache_hash_code>
inline void
- swap (unordered_set<_Value, _Hash, _Pred,
+ swap (__unordered_set<_Value, _Hash, _Pred,
_Alloc, __cache_hash_code>& __x,
- unordered_set<_Value, _Hash, _Pred,
+ __unordered_set<_Value, _Hash, _Pred,
_Alloc, __cache_hash_code>& __y)
{ __x.swap(__y); }
template<class _Value, class _Hash, class _Pred, class _Alloc,
bool __cache_hash_code>
inline void
- swap(unordered_multiset<_Value, _Hash, _Pred,
+ swap(__unordered_multiset<_Value, _Hash, _Pred,
_Alloc, __cache_hash_code>& __x,
- unordered_multiset<_Value, _Hash, _Pred,
+ __unordered_multiset<_Value, _Hash, _Pred,
_Alloc, __cache_hash_code>& __y)
{ __x.swap(__y); }
+
+ template<class _Value,
+ class _Hash = hash<_Value>,
+ class _Pred = std::equal_to<_Value>,
+ class _Alloc = std::allocator<_Value> >
+ class unordered_set
+ : public __unordered_set<_Value, _Hash, _Pred, _Alloc>
+ {
+ typedef __unordered_set<_Value, _Hash, _Pred, _Alloc> _Base;
+
+ public:
+ typedef typename _Base::size_type size_type;
+ typedef typename _Base::hasher hasher;
+ typedef typename _Base::key_equal key_equal;
+ typedef typename _Base::allocator_type allocator_type;
+
+ explicit
+ unordered_set(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__n, __hf, __eql, __a)
+ { }
+
+ template<typename _InputIterator>
+ unordered_set(_InputIterator __f, _InputIterator __l,
+ size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__f, __l, __n, __hf, __eql, __a)
+ { }
+ };
+
+ template<class _Value,
+ class _Hash = hash<_Value>,
+ class _Pred = std::equal_to<_Value>,
+ class _Alloc = std::allocator<_Value> >
+ class unordered_multiset
+ : public __unordered_multiset<_Value, _Hash, _Pred, _Alloc>
+ {
+ typedef __unordered_multiset<_Value, _Hash, _Pred, _Alloc> _Base;
+
+ public:
+ typedef typename _Base::size_type size_type;
+ typedef typename _Base::hasher hasher;
+ typedef typename _Base::key_equal key_equal;
+ typedef typename _Base::allocator_type allocator_type;
+
+ explicit
+ unordered_multiset(size_type __n = 10,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__n, __hf, __eql, __a)
+ { }
+
+
+ template<typename _InputIterator>
+ unordered_multiset(_InputIterator __f, _InputIterator __l,
+ typename _Base::size_type __n = 0,
+ const hasher& __hf = hasher(),
+ const key_equal& __eql = key_equal(),
+ const allocator_type& __a = allocator_type())
+ : _Base(__f, __l, __n, __hf, __eql, __a)
+ { }
+ };
+
_GLIBCXX_END_NAMESPACE
}
Index: testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc (revision 122172)
+++ testsuite/tr1/6_containers/unordered_multimap/requirements/explicit_instantiation.cc (working copy)
@@ -2,7 +2,7 @@
// 2005-02-17 Matt Austern <austern@apple.com>
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,9 +29,12 @@
using namespace std::tr1;
template class unordered_multimap<string, float>;
-template class unordered_multimap<string, float,
+template class unordered_multimap<string, int,
hash<string>, equal_to<string>,
- allocator<pair<const string, float> >, true>;
+ allocator<pair<const string, int> > >;
template class unordered_multimap<string, float,
- hash<string>, equal_to<string>,
- allocator<char>, false>;
+ hash<string>, equal_to<string>,
+ allocator<char> >;
+template class __unordered_multimap<string, int,
+ hash<string>, equal_to<string>,
+ allocator<pair<const string, int> >, true>;
Index: testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc (revision 122172)
+++ testsuite/tr1/6_containers/unordered_set/requirements/explicit_instantiation.cc (working copy)
@@ -2,7 +2,7 @@
// 2005-02-17 Matt Austern <austern@apple.com>
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -28,7 +28,9 @@
using namespace std::tr1;
template class unordered_set<int>;
+template class unordered_set<float, hash<float>, equal_to<float>,
+ allocator<float> >;
template class unordered_set<int, hash<int>, equal_to<int>,
- allocator<int>, true>;
-template class unordered_set<int, hash<int>, equal_to<int>,
- allocator<char>, false>;
+ allocator<char> >;
+template class __unordered_set<float, hash<float>, equal_to<float>,
+ allocator<float>, true>;
Index: testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc (revision 122172)
+++ testsuite/tr1/6_containers/unordered_map/requirements/explicit_instantiation.cc (working copy)
@@ -2,7 +2,7 @@
// 2005-02-17 Matt Austern <austern@apple.com>
//
-// Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,9 +29,12 @@
using namespace std::tr1;
template class unordered_map<string, float>;
-template class unordered_map<string, float,
+template class unordered_map<string, int,
hash<string>, equal_to<string>,
- allocator<pair<const string, float> >, true>;
+ allocator<pair<const string, int> > >;
template class unordered_map<string, float,
hash<string>, equal_to<string>,
- allocator<char>, false>;
+ allocator<char> >;
+template class __unordered_map<string, int,
+ hash<string>, equal_to<string>,
+ allocator<pair<const string, int> >, true>;
Index: testsuite/tr1/6_containers/unordered_map/24064.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_map/24064.cc (revision 122172)
+++ testsuite/tr1/6_containers/unordered_map/24064.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (C) 2005 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -29,7 +29,7 @@
using namespace std;
using namespace tr1;
- unordered_map<int, char, hash<int>, equal_to<int>,
+ __unordered_map<int, char, hash<int>, equal_to<int>,
allocator<pair<const int, char> >, true> m;
for (int i = 0; i < 1000; ++i)
Index: testsuite/tr1/6_containers/headers/unordered_set/synopsis.cc
===================================================================
--- testsuite/tr1/6_containers/headers/unordered_set/synopsis.cc (revision 122172)
+++ testsuite/tr1/6_containers/headers/unordered_set/synopsis.cc (working copy)
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// 2007-02-04 Benjamin Kosnik <bkoz@redhat.com>
//
Index: testsuite/tr1/6_containers/headers/unordered_map/synopsis.cc
===================================================================
--- testsuite/tr1/6_containers/headers/unordered_map/synopsis.cc (revision 122172)
+++ testsuite/tr1/6_containers/headers/unordered_map/synopsis.cc (working copy)
@@ -1,5 +1,4 @@
-// { dg-do compile { xfail *-*-* } }
-// { dg-excess-errors "" }
+// { dg-do compile }
// 2007-02-04 Benjamin Kosnik <bkoz@redhat.com>
//
Index: testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc (revision 122172)
+++ testsuite/tr1/6_containers/unordered_multiset/requirements/explicit_instantiation.cc (working copy)
@@ -2,7 +2,7 @@
// 2005-02-17 Matt Austern <austern@apple.com>
//
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -28,7 +28,9 @@
using namespace std::tr1;
template class unordered_multiset<int>;
+template class unordered_multiset<float, hash<float>, equal_to<float>,
+ allocator<float> >;
template class unordered_multiset<int, hash<int>, equal_to<int>,
- allocator<int>, true>;
-template class unordered_multiset<int, hash<int>, equal_to<int>,
- allocator<char>, false>;
+ allocator<char> >;
+template class __unordered_multiset<float, hash<float>, equal_to<float>,
+ allocator<float>, true>;
Index: testsuite/util/native_type/assoc/native_hash_set.hpp
===================================================================
--- testsuite/util/native_type/assoc/native_hash_set.hpp (revision 122189)
+++ testsuite/util/native_type/assoc/native_hash_set.hpp (working copy)
@@ -1,6 +1,6 @@
// -*- C++ -*-
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -68,12 +68,12 @@
{
#ifdef PB_DS_USE_TR1
#define PB_DS_BASE_C_DEC \
- std::tr1::unordered_set<Key, Hash_Fn, Eq_Fn, \
- typename Allocator::template rebind<Key>::other>
+ std::tr1::__unordered_set<Key, Hash_Fn, Eq_Fn, \
+ typename Allocator::template rebind<Key>::other, Cache_Hash>
#else
#define PB_DS_BASE_C_DEC \
__gnu_cxx::hash_set<Key, Hash_Fn, Eq_Fn, \
- typename Allocator::template rebind<Key>::other>
+ typename Allocator::template rebind<Key>::other>
#endif
template<typename Key,
Index: testsuite/util/native_type/assoc/native_hash_map.hpp
===================================================================
--- testsuite/util/native_type/assoc/native_hash_map.hpp (revision 122189)
+++ testsuite/util/native_type/assoc/native_hash_map.hpp (working copy)
@@ -1,6 +1,6 @@
// -*- C++ -*-
-// Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -68,7 +68,7 @@
{
#ifdef PB_DS_USE_TR1
#define PB_DS_BASE_C_DEC \
- std::tr1::unordered_map<Key, Data, Hash_Fn, Eq_Fn, \
+ std::tr1::__unordered_map<Key, Data, Hash_Fn, Eq_Fn, \
typename Allocator::template rebind<std::pair<const Key, Data> >::other, Cache_Hash>
#else
#define PB_DS_BASE_C_DEC \