Revert previous commit.

Tessil · Jul 24, 2017 · fde3676 · fde3676
1 parent dc3c351
commit fde3676
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/hopscotch_hash.h b/src/hopscotch_hash.h
@@ -171,7 +171,7 @@ class mod_growth_policy {
             throw std::length_error("The map exceeds its maxmimum size.");
         }
 
-        const double next_bucket_count = std::ceil(m_bucket_count * REHASH_SIZE_MULTIPLICATION_FACTOR);
+        const double next_bucket_count = std::ceil(double(m_bucket_count) * REHASH_SIZE_MULTIPLICATION_FACTOR);
         if(!std::isnormal(next_bucket_count)) {
             throw std::length_error("The map exceeds its maxmimum size.");
         }
@@ -1283,8 +1283,7 @@ class hopscotch_hash: private Hash, private KeyEqual, private GrowthPolicy {
      *  Hash policy 
      */
     float load_factor() const {
-        tsl_assert(bucket_count() != 0);
-        return m_nb_elements/float(bucket_count());
+        return float(m_nb_elements)/float(bucket_count());
     }
 
     float max_load_factor() const {
@@ -1293,17 +1292,17 @@ class hopscotch_hash: private Hash, private KeyEqual, private GrowthPolicy {
 
     void max_load_factor(float ml) {
         m_max_load_factor = ml;
-        m_load_threshold = size_type(bucket_count()*m_max_load_factor);
+        m_load_threshold = size_type(float(bucket_count())*m_max_load_factor);
         m_min_load_factor_rehash_threshold = size_type(bucket_count()*MIN_LOAD_FACTOR_FOR_REHASH);
     }
 
     void rehash(size_type count) {
-        count = std::max(count, size_type(std::ceil(size()/max_load_factor())));
+        count = std::max(count, size_type(std::ceil(float(size())/max_load_factor())));
         rehash_impl(count);
     }
 
     void reserve(size_type count) {
-        rehash(size_type(std::ceil(count/max_load_factor())));
+        rehash(size_type(std::ceil(float(count)/max_load_factor())));
     }