hashtable_policy.h (struct _LessThan): Remove.

2007-12-01  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1_impl/hashtable_policy.h (struct _LessThan): Remove.
	(_Prime_rehash_policy::_M_bkt_for_elements, _Prime_rehash_policy::
	_M_need_rehash): Adjust.

From-SVN: r130558

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e5dc1f9b775accd6db670eaef68da4ef7cadcf04..2c5ba2ed94f70edcda0b88e4ffaaf01f06aeb8c7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-01  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/tr1_impl/hashtable_policy.h (struct _LessThan): Remove.
+       (_Prime_rehash_policy::_M_bkt_for_elements, _Prime_rehash_policy::
+       _M_need_rehash): Adjust.
+
 2007-12-01  Paolo Carlini  <pcarlini@suse.de>
 
        * include/bits/stl_tempbuf.h (__get_temporary_buffer): Fold

diff --git a/libstdc++-v3/include/tr1_impl/hashtable_policy.h b/libstdc++-v3/include/tr1_impl/hashtable_policy.h
index 79740fad31ef5e50772d449b10869acee580ffe4..5c48504a79853850e0a8ce0d03e7bc8269b7d20b 100644 (file)
--- a/libstdc++-v3/include/tr1_impl/hashtable_policy.h
+++ b/libstdc++-v3/include/tr1_impl/hashtable_policy.h
@@ -66,14 +66,6 @@ namespace __detail
   // place to put TR1 .cc files yet.  There's no good reason for any of
   // _Prime_rehash_policy's member functions to be inline, and there's
   // certainly no good reason for _Primes<> to exist at all.  
-  struct _LessThan
-  {
-    template<typename _Tp, typename _Up>
-      bool
-      operator()(_Tp __x, _Up __y)
-      { return __x < __y; }
-  };
-
   template<int __ulongsize = sizeof(unsigned long)>
     struct _Primes
     {
@@ -545,7 +537,7 @@ namespace __detail
                                         + _Primes<>::__n_primes);
     const float __min_bkts = __n / _M_max_load_factor;
     const unsigned long* __p = std::lower_bound(_Primes<>::__primes, __last,
-                                               __min_bkts, _LessThan());
+                                               __min_bkts);
     _M_next_resize = static_cast<std::size_t>(std::ceil(*__p
                                                        * _M_max_load_factor));
     return *__p;
@@ -575,8 +567,7 @@ namespace __detail
            const unsigned long* const __last = (_Primes<>::__primes
                                                 + _Primes<>::__n_primes);
            const unsigned long* __p = std::lower_bound(_Primes<>::__primes,
-                                                       __last, __min_bkts,
-                                                       _LessThan());
+                                                       __last, __min_bkts);
            _M_next_resize = 
              static_cast<std::size_t>(std::ceil(*__p * _M_max_load_factor));
            return std::make_pair(true, *__p);