aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2020-12-18 11:52:24 -0500
committerPatrick Palka <ppalka@redhat.com>2020-12-18 11:52:24 -0500
commit22a7e82c200d01d12e34e757e86dc9796a9bf085 (patch)
tree3ce2454afb6c2561553a70284de18524cd166360
parentd7bab388b818fc21dbb9111311e114ae33e11fff (diff)
downloadgcc-22a7e82c200d01d12e34e757e86dc9796a9bf085.zip
gcc-22a7e82c200d01d12e34e757e86dc9796a9bf085.tar.gz
gcc-22a7e82c200d01d12e34e757e86dc9796a9bf085.tar.bz2
libstdc++: Fix build failure on AArch64 ILP32 [PR98370]
This should fix a build failure on AArch64 ILP32 due to int32_t mapping to long int instead of int on this platform, which causes type deduction to fail in the below call to std::max as reported in the PR. libstdc++-v3/ChangeLog: PR libstdc++/98370 * src/c++17/floating_to_chars.cc (__floating_to_chars_shortest): Provide explicit template arguments to the call to std::max.
-rw-r--r--libstdc++-v3/src/c++17/floating_to_chars.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++17/floating_to_chars.cc b/libstdc++-v3/src/c++17/floating_to_chars.cc
index 6470fbb..3f46bce 100644
--- a/libstdc++-v3/src/c++17/floating_to_chars.cc
+++ b/libstdc++-v3/src/c++17/floating_to_chars.cc
@@ -977,7 +977,7 @@ template<typename T>
// fd.exponent contain all of the information needed to format the
// number in fixed notation "as if by std::printf" (with precision
// equal to -fd.exponent).
- const int whole_digits = max(mantissa_length + fd.exponent, 1);
+ const int whole_digits = max<int>(mantissa_length + fd.exponent, 1);
const int expected_output_length
= fd.sign + whole_digits + strlen(".") + -fd.exponent;
if (last - first < expected_output_length)