2010-02-10 Paolo Carlini <paolo.carlini@oracle.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / tr1_impl / hashtable_policy.h

diff --git a/libstdc++-v3/include/tr1_impl/hashtable_policy.h b/libstdc++-v3/include/tr1_impl/hashtable_policy.h
index 8996d04..6b2dd34 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/hashtable_policy.h
+++ b/libstdc++-v3/include/tr1_impl/hashtable_policy.h
@@ -1,6 +1,6 @@
 // Internal policy header for TR1 unordered_set and unordered_map -*- C++ -*-
 
-// Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010 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,8 +29,8 @@
 
 namespace std
 { 
-_GLIBCXX_BEGIN_NAMESPACE_TR1
-
+namespace tr1
+{
 namespace __detail
 {
   // Helper function: return distance(first, last) for forward
@@ -94,13 +94,6 @@ namespace __detail
       _Value       _M_v;
       std::size_t  _M_hash_code;
       _Hash_node*  _M_next;
-
-#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
-      template<typename... _Args>
-        _Hash_node(_Args&&... __args)
-         : _M_v(std::forward<_Args>(__args)...),
-           _M_hash_code(), _M_next() { }
-#endif
     };
 
   template<typename _Value>
@@ -108,13 +101,6 @@ namespace __detail
     {
       _Value       _M_v;
       _Hash_node*  _M_next;
-
-#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
-      template<typename... _Args>
-        _Hash_node(_Args&&... __args)
-         : _M_v(std::forward<_Args>(__args)...),
-           _M_next() { }
-#endif
     };
 
   // Local iterators, used to iterate within a bucket but not between
@@ -545,16 +531,6 @@ namespace __detail
       
       mapped_type&
       operator[](const _Key& __k);
-
-#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 761. unordered_map needs an at() member function.
-      mapped_type&
-      at(const _Key& __k);
-
-      const mapped_type&
-      at(const _Key& __k) const;
-#endif
     };
 
   template<typename _Key, typename _Pair, typename _Hashtable>
@@ -576,44 +552,6 @@ namespace __detail
       return (__p->_M_v).second;
     }
 
-#ifdef _GLIBCXX_INCLUDE_AS_CXX0X
-  template<typename _Key, typename _Pair, typename _Hashtable>
-    typename _Map_base<_Key, _Pair, std::_Select1st<_Pair>,
-                      true, _Hashtable>::mapped_type&
-    _Map_base<_Key, _Pair, std::_Select1st<_Pair>, true, _Hashtable>::
-    at(const _Key& __k)
-    {
-      _Hashtable* __h = static_cast<_Hashtable*>(this);
-      typename _Hashtable::_Hash_code_type __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code,
-                                            __h->_M_bucket_count);
-
-      typename _Hashtable::_Node* __p =
-       __h->_M_find_node(__h->_M_buckets[__n], __k, __code);
-      if (!__p)
-       __throw_out_of_range(__N("_Map_base::at"));
-      return (__p->_M_v).second;
-    }
-
-  template<typename _Key, typename _Pair, typename _Hashtable>
-    const typename _Map_base<_Key, _Pair, std::_Select1st<_Pair>,
-                            true, _Hashtable>::mapped_type&
-    _Map_base<_Key, _Pair, std::_Select1st<_Pair>, true, _Hashtable>::
-    at(const _Key& __k) const
-    {
-      const _Hashtable* __h = static_cast<const _Hashtable*>(this);
-      typename _Hashtable::_Hash_code_type __code = __h->_M_hash_code(__k);
-      std::size_t __n = __h->_M_bucket_index(__k, __code,
-                                            __h->_M_bucket_count);
-
-      typename _Hashtable::_Node* __p =
-       __h->_M_find_node(__h->_M_buckets[__n], __k, __code);
-      if (!__p)
-       __throw_out_of_range(__N("_Map_base::at"));
-      return (__p->_M_v).second;
-    }
-#endif
-
   // class template _Rehash_base.  Give hashtable the max_load_factor
   // functions iff the rehash policy is _Prime_rehash_policy.
   template<typename _RehashPolicy, typename _Hashtable>
@@ -860,6 +798,5 @@ namespace __detail
       _H2          _M_h2;
     };
 } // namespace __detail
-
-_GLIBCXX_END_NAMESPACE_TR1
+}
 }