diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-01-18 09:46:16 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-01-18 09:53:30 +0000 |
| commit | 97b9236976a4914d268089613d1fb42ece34aff9 (patch) | |
| tree | b85c2e9e36338442e0921b650e49df9c730a93eb | |
| parent | ac358eef7aed2587dac421fe450db12d45a42ff3 (diff) | |
| download | gcc-97b9236976a4914d268089613d1fb42ece34aff9.zip gcc-97b9236976a4914d268089613d1fb42ece34aff9.tar.gz gcc-97b9236976a4914d268089613d1fb42ece34aff9.tar.bz2 | |
libstdc++: Fix deduction failure for std::min call [PR104080]
libstdc++-v3/ChangeLog:
PR libstdc++/104080
* src/c++17/fast_float/LOCAL_PATCHES: UPDATE.
* src/c++17/fast_float/fast_float.h (round): Use explicit
template argument list for std::min.
| -rw-r--r-- | libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES | 1 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++17/fast_float/fast_float.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES index 71495d6..447c7ed 100644 --- a/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES +++ b/libstdc++-v3/src/c++17/fast_float/LOCAL_PATCHES @@ -1,2 +1,3 @@ r12-6647 r12-6648 +r12-6664 diff --git a/libstdc++-v3/src/c++17/fast_float/fast_float.h b/libstdc++-v3/src/c++17/fast_float/fast_float.h index 97d2894..ee12930 100644 --- a/libstdc++-v3/src/c++17/fast_float/fast_float.h +++ b/libstdc++-v3/src/c++17/fast_float/fast_float.h @@ -2466,7 +2466,7 @@ fastfloat_really_inline void round(adjusted_mantissa& am, callback cb) noexcept if (-am.power2 >= mantissa_shift) { // have a denormal float int32_t shift = -am.power2 + 1; - cb(am, std::min(shift, 64)); + cb(am, std::min<int32_t>(shift, 64)); // check for round-up: if rounding-nearest carried us to the hidden bit. am.power2 = (am.mantissa < (uint64_t(1) << binary_format<T>::mantissa_explicit_bits())) ? 0 : 1; return; |