From efbf13685eddf83f39e9403e690f0732f85e2dc5 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 21 Sep 2009 21:18:21 +0000 Subject: [PATCH] Use std::max. [SVN r56349] --- include/boost/unordered/detail/table.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/boost/unordered/detail/table.hpp b/include/boost/unordered/detail/table.hpp index 8d94bcd7..9e80078b 100644 --- a/include/boost/unordered/detail/table.hpp +++ b/include/boost/unordered/detail/table.hpp @@ -417,10 +417,9 @@ namespace boost { namespace unordered_detail { inline bool hash_table::reserve_for_insert(std::size_t size) { if(size >= max_load_) { - std::size_t s = this->size_; - s = s + (s >> 1); std::size_t num_buckets - = this->min_buckets_for_size(s > size ? s : size); + = this->min_buckets_for_size((std::max)(size, + this->size_ + (this->size_ >> 1))); if(num_buckets != this->bucket_count_) { rehash_impl(num_buckets); return true; @@ -446,9 +445,9 @@ namespace boost { namespace unordered_detail { else { // no throw: // TODO: Needlessly calling next_prime twice. - std::size_t min_size = this->min_buckets_for_size(this->size_); - min_buckets = next_prime(min_buckets); - min_buckets = min_size > min_buckets ? min_size : min_buckets; + min_buckets = (std::max)( + next_prime(min_buckets), + this->min_buckets_for_size(this->size_)); if(min_buckets != this->bucket_count_) rehash_impl(min_buckets); } }