diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 30b954e..9130181 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2011-07-24 Paolo Carlini <paolo.carlini@oracle.com> + + * include/bits/hashtable_policy.h (_Prime_rehash_policy::_M_next_bkt, + _M_bkt_for_elements, _M_need_rehash): Fix typos in the last commit. + 2011-07-24 François Dumont <francois.cppdevs@free.fr> * include/bits/hashtable_policy.h (_Prime_rehash_policy): Use diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index df17855..ab34463 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -431,7 +431,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + _S_n_primes, __n); _M_next_resize = static_cast<std::size_t>(__builtin_floor(__p * _M_max_load_factor)); - return *__p; + return __p; } // Return the smallest prime p such that alpha p >= n, where alpha @@ -445,7 +445,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + _S_n_primes, __min_bkts); _M_next_resize = static_cast<std::size_t>(__builtin_floor(__p * _M_max_load_factor)); - return *__p; + return __p; } // Finds the smallest prime p such that alpha p > __n_elt + __n_ins. @@ -474,7 +474,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __min_bkts); _M_next_resize = static_cast<std::size_t> (__builtin_floor(__p * _M_max_load_factor)); - return std::make_pair(true, *__p); + return std::make_pair(true, __p); } else { |