feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Merge latest unordered developments:

Browse Source 
Make simple_test test a little more.
Use doubles for calculating max load factor.
Some workarounds, mostly for Borland and running the tests.


[SVN r42666]
This commit is contained in:
Daniel James
2008-01-10 22:30:46 +00:00
parent 488bce194c
commit 9d7411840e
31 changed files with 458 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/unordered/detail/hash_table.hpp
+3 -3
View File
@@ -32,7 +32,7 @@
#include <boost/mpl/aux_/config/eti.hpp>
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
#if BOOST_WORKAROUND(__BORLANDC__, <= 0x0582)
#define BOOST_UNORDERED_BORLAND_BOOL(x) (bool)(x)
#else
#define BOOST_UNORDERED_BORLAND_BOOL(x) x
@@ -63,9 +63,9 @@ namespace boost {
#endif
}
inline std::size_t float_to_size_t(float f)
inline std::size_t double_to_size_t(double f)
{
return f >= static_cast<float>((std::numeric_limits<std::size_t>::max)()) ?
return f >= static_cast<double>((std::numeric_limits<std::size_t>::max)()) ?
(std::numeric_limits<std::size_t>::max)() :
static_cast<std::size_t>(f);
}
include/boost/unordered/detail/hash_table_impl.hpp
+8 -7
View File
@@ -1228,8 +1228,8 @@ namespace boost {
using namespace std;
// size < mlf_ * count
return float_to_size_t(ceil(
max_bucket_count() * mlf_)) - 1;
return double_to_size_t(ceil(
(double) mlf_ * max_bucket_count())) - 1;
}
// strong safety
@@ -1274,7 +1274,7 @@ namespace boost {
//
// Or from rehash post-condition:
// count > size / mlf_
return static_cast<size_type>(floor(n / mlf_)) + 1;
return double_to_size_t(floor(n / (double) mlf_)) + 1;
}
// no throw
@@ -1284,7 +1284,8 @@ namespace boost {
// From 6.3.1/13:
// Only resize when size >= mlf_ * count
max_load_ = float_to_size_t(ceil(mlf_ * this->bucket_count_));
max_load_ = double_to_size_t(ceil(
(double) mlf_ * this->bucket_count_));
}
// basic exception safety
@@ -1310,7 +1311,8 @@ namespace boost {
bool need_to_reserve = n >= max_load_;
// throws - basic:
if (need_to_reserve) {
rehash_impl(static_cast<size_type>(floor(n / mlf_ * 1.25)) + 1);
rehash_impl(double_to_size_t(floor(
n / (double) mlf_ * 1.25)) + 1);
}
BOOST_ASSERT(n < max_load_ || n > max_size());
return need_to_reserve;
@@ -1721,8 +1723,7 @@ namespace boost {
// Create the node before rehashing in case it throws an
// exception (need strong safety in such a case).
value_type const& v = *i;
a.construct(v);
a.construct(*i);
// reserve has basic exception safety if the hash function
// throws, strong otherwise.