2010-03-19 Paolo Carlini <paolo.carlini@oracle.com>

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

diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h
index 8471dfb..142c57f 100644 (file)
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -56,29 +56,6 @@ namespace __detail
       return __distance_fw(__first, __last, _Tag());
     }
 
-  template<typename _RAIter, typename _Tp>
-    _RAIter
-    __lower_bound(_RAIter __first, _RAIter __last, const _Tp& __val)
-    {
-      typedef typename std::iterator_traits<_RAIter>::difference_type _DType;
-
-      _DType __len = __last - __first;
-      while (__len > 0)
-       {
-         _DType __half = __len >> 1;
-         _RAIter __middle = __first + __half;
-         if (*__middle < __val)
-           {
-             __first = __middle;
-             ++__first;
-             __len = __len - __half - 1;
-           }
-         else
-           __len = __half;
-       }
-      return __first;
-    }
-
   // Auxiliary types used for all instantiations of _Hashtable: nodes
   // and iterators.
   
@@ -447,8 +424,8 @@ namespace __detail
   _Prime_rehash_policy::
   _M_next_bkt(std::size_t __n) const
   {
-    const unsigned long* __p = __lower_bound(__prime_list, __prime_list
-                                            + _S_n_primes, __n);
+    const unsigned long* __p = std::lower_bound(__prime_list, __prime_list
+                                               + _S_n_primes, __n);
     _M_next_resize = 
       static_cast<std::size_t>(__builtin_ceil(*__p * _M_max_load_factor));
     return *__p;
@@ -461,8 +438,8 @@ namespace __detail
   _M_bkt_for_elements(std::size_t __n) const
   {
     const float __min_bkts = __n / _M_max_load_factor;
-    const unsigned long* __p = __lower_bound(__prime_list, __prime_list
-                                            + _S_n_primes, __min_bkts);
+    const unsigned long* __p = std::lower_bound(__prime_list, __prime_list
+                                               + _S_n_primes, __min_bkts);
     _M_next_resize =
       static_cast<std::size_t>(__builtin_ceil(*__p * _M_max_load_factor));
     return *__p;
@@ -490,8 +467,8 @@ namespace __detail
          {
            __min_bkts = std::max(__min_bkts, _M_growth_factor * __n_bkt);
            const unsigned long* __p =
-             __lower_bound(__prime_list, __prime_list + _S_n_primes,
-                           __min_bkts);
+             std::lower_bound(__prime_list, __prime_list + _S_n_primes,
+                              __min_bkts);
            _M_next_resize = static_cast<std::size_t>
              (__builtin_ceil(*__p * _M_max_load_factor));
            return std::make_pair(true, *__p);