Merge in latest unordered developments (revisions 42607-42611).

[SVN r42612]
This commit is contained in:
Daniel James committed 2008-01-08 13:59:01 +00:00
1 parent dfac5aab41
commit e847046f95
5 files changed
+37 -40

No files matched your search

@@ -48,8 +48,8 @@ namespace boost {
namespace unordered_detail {
template <class T> struct type_wrapper {};
const static std::size_t default_initial_bucket_count = 50;
const static float minimum_max_load_factor = 1e-3f;
static const std::size_t default_initial_bucket_count = 50;
static const float minimum_max_load_factor = 1e-3f;
inline std::size_t next_prime(std::size_t n);
template <class T>
@@ -65,7 +65,7 @@ namespace boost {
inline std::size_t float_to_size_t(float f)
{
return f > static_cast<float>((std::numeric_limits<std::size_t>::max)()) ?
return f >= static_cast<float>((std::numeric_limits<std::size_t>::max)()) ?
(std::numeric_limits<std::size_t>::max)() :
static_cast<std::size_t>(f);
}