From db2cf61cdec8684c9e877192a6c1e1f19a941d65 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Sat, 15 Feb 2014 10:39:41 -0800 Subject: [PATCH] Fix warnings on older GCC, take 2. --- format.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/format.cc b/format.cc index 059e8701..37f07a1a 100644 --- a/format.cc +++ b/format.cc @@ -117,7 +117,7 @@ const char fmt::internal::DIGITS[] = "6061626364656667686970717273747576777879" "8081828384858687888990919293949596979899"; -FMT_GCC_EXTENSION const uint64_t fmt::internal::POWERS_OF_10[] = { +const uint64_t fmt::internal::POWERS_OF_10[] = { 0, 10, 100, @@ -128,16 +128,16 @@ FMT_GCC_EXTENSION const uint64_t fmt::internal::POWERS_OF_10[] = { 10000000, 100000000, 1000000000, - 10000000000ull, - 100000000000ull, - 1000000000000ull, - 10000000000000ull, - 100000000000000ull, - 1000000000000000ull, - 10000000000000000ull, - 100000000000000000ull, - 1000000000000000000ull, - 10000000000000000000ull + ULongLong(1000000000) * 10, + ULongLong(1000000000) * 100, + ULongLong(1000000000) * 1000, + ULongLong(1000000000) * 10000, + ULongLong(1000000000) * 100000, + ULongLong(1000000000) * 1000000, + ULongLong(1000000000) * 10000000, + ULongLong(1000000000) * 100000000, + ULongLong(1000000000) * 1000000000, + ULongLong(1000000000) * 10000000000 }; void fmt::internal::ReportUnknownType(char code, const char *type) {