libstdc++: Use double for unordered container load factors [PR 96958]

My previous commit for this PR changed the types from long double to
double, but didn't change the uses of __builtin_ceill and
__builtin_floorl. It also failed to change the non-inline functions in
src/c++11/hashtable_c++0x.cc. This should fix it properly now.

libstdc++-v3/ChangeLog:

	PR libstdc++/96958
	* include/bits/hashtable_policy.h (_Prime_rehash_policy)
	(_Power2_rehash_policy): Use ceil and floor instead of ceill and
	floorl.
	* src/c++11/hashtable_c++0x.cc (_Prime_rehash_policy): Likewise.
	Use double instead of long double.

diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h
index 7fed87f1c76b8770090ceec618e9dea0eab3358b..28372979c873b4bb14e3d85818678d5812a1c50e 100644 (file)
--- a/libstdc++-v3/include/bits/hashtable_policy.h
+++ b/libstdc++-v3/include/bits/hashtable_policy.h
@@ -458,7 +458,7 @@ namespace __detail
     // Return a bucket count appropriate for n elements
     std::size_t
     _M_bkt_for_elements(std::size_t __n) const
-    { return __builtin_ceill(__n / (double)_M_max_load_factor); }
+    { return __builtin_ceil(__n / (double)_M_max_load_factor); }
 
     // __n_bkt is current bucket count, __n_elt is current element count,
     // and __n_ins is number of elements to be inserted.  Do we need to
@@ -559,7 +559,7 @@ namespace __detail
        _M_next_resize = size_t(-1);
       else
        _M_next_resize
-         = __builtin_floorl(__res * (double)_M_max_load_factor);
+         = __builtin_floor(__res * (double)_M_max_load_factor);
 
       return __res;
     }
@@ -567,7 +567,7 @@ namespace __detail
     // Return a bucket count appropriate for n elements
     std::size_t
     _M_bkt_for_elements(std::size_t __n) const noexcept
-    { return __builtin_ceill(__n / (double)_M_max_load_factor); }
+    { return __builtin_ceil(__n / (double)_M_max_load_factor); }
 
     // __n_bkt is current bucket count, __n_elt is current element count,
     // and __n_ins is number of elements to be inserted.  Do we need to
@@ -587,11 +587,11 @@ namespace __detail
              / (double)_M_max_load_factor;
          if (__min_bkts >= __n_bkt)
            return { true,
-             _M_next_bkt(std::max<std::size_t>(__builtin_floorl(__min_bkts) + 1,
+             _M_next_bkt(std::max<std::size_t>(__builtin_floor(__min_bkts) + 1,
                                                __n_bkt * _S_growth_factor)) };
 
          _M_next_resize
-           = __builtin_floorl(__n_bkt * (double)_M_max_load_factor);
+           = __builtin_floor(__n_bkt * (double)_M_max_load_factor);
          return { false, 0 };
        }
       else

diff --git a/libstdc++-v3/src/c++11/hashtable_c++0x.cc b/libstdc++-v3/src/c++11/hashtable_c++0x.cc
index 62762f34cafc0a65b57e0a0dd22d2a0e471e6dd9..4dec2a84641e96706428d27185792bdf41259f17 100644 (file)
--- a/libstdc++-v3/src/c++11/hashtable_c++0x.cc
+++ b/libstdc++-v3/src/c++11/hashtable_c++0x.cc
@@ -58,7 +58,7 @@ namespace __detail
          return 1;
 
        _M_next_resize =
-         __builtin_floorl(__fast_bkt[__n] * (long double)_M_max_load_factor);
+         __builtin_floor(__fast_bkt[__n] * (double)_M_max_load_factor);
        return __fast_bkt[__n];
       }
 
@@ -81,7 +81,7 @@ namespace __detail
       _M_next_resize = size_t(-1);
     else
       _M_next_resize =
-       __builtin_floorl(*__next_bkt * (long double)_M_max_load_factor);
+       __builtin_floor(*__next_bkt * (double)_M_max_load_factor);
 
     return *__next_bkt;
   }
@@ -105,16 +105,16 @@ namespace __detail
        // If _M_next_resize is 0 it means that we have nothing allocated so
        // far and that we start inserting elements. In this case we start
        // with an initial bucket size of 11.
-       long double __min_bkts
+       double __min_bkts
          = std::max<std::size_t>(__n_elt + __n_ins, _M_next_resize ? 0 : 11)
-         / (long double)_M_max_load_factor;
+         / (double)_M_max_load_factor;
        if (__min_bkts >= __n_bkt)
          return { true,
-           _M_next_bkt(std::max<std::size_t>(__builtin_floorl(__min_bkts) + 1,
+           _M_next_bkt(std::max<std::size_t>(__builtin_floor(__min_bkts) + 1,
                                              __n_bkt * _S_growth_factor)) };
 
        _M_next_resize
-         = __builtin_floorl(__n_bkt * (long double)_M_max_load_factor);
+         = __builtin_floor(__n_bkt * (double)_M_max_load_factor);
        return { false, 0 };
       }
     else