boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2026-05-04 03:40:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[SVN r42612]
This commit is contained in:
Daniel James
2008-01-08 13:59:01 +00:00
parent dfac5aab41
commit e847046f95
5 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/unordered/detail/allocator.hpp
+1 -1
View File
@@ -207,7 +207,7 @@ namespace boost {
BOOST_ASSERT(!ptr_);
length_ = l;
ptr_ = alloc_.allocate(length_);
pointer end = ptr_ + length_;
pointer end = ptr_ + static_cast<std::ptrdiff_t>(length_);
for(constructed_ = ptr_; constructed_ != end; ++constructed_)
alloc_.construct(constructed_, v);
}
include/boost/unordered/detail/hash_table.hpp
+3 -3
View File
@@ -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);
}