Fix more warnings on older GCC.

This commit is contained in:
Victor Zverovich 2014-02-15 10:17:10 -08:00
parent 0c3a2f5dcb
commit ff0d5d1771
2 changed files with 4 additions and 8 deletions

View File

@ -117,7 +117,7 @@ const char fmt::internal::DIGITS[] =
"6061626364656667686970717273747576777879" "6061626364656667686970717273747576777879"
"8081828384858687888990919293949596979899"; "8081828384858687888990919293949596979899";
const uint64_t fmt::internal::POWERS_OF_10[] = { FMT_GCC_EXTENSION const uint64_t fmt::internal::POWERS_OF_10[] = {
0, 0,
10, 10,
100, 100,

View File

@ -44,6 +44,7 @@
#ifdef __GNUC__ #ifdef __GNUC__
# define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
# define FMT_GCC_EXTENSION __extension__
#endif #endif
// Compatibility with compilers other than clang. // Compatibility with compilers other than clang.
@ -79,13 +80,8 @@ namespace fmt {
// Fix the warning about long long on older versions of GCC // Fix the warning about long long on older versions of GCC
// that don't support the diagnostic pragma. // that don't support the diagnostic pragma.
#ifdef __GNUC__ FMT_GCC_EXTENSION typedef long long LongLong;
__extension__ typedef long long LongLong; FMT_GCC_EXTENSION typedef unsigned long long ULongLong;
__extension__ typedef unsigned long long ULongLong;
#else
typedef long long LongLong;
typedef unsigned long long ULongLong;
#endif
namespace internal { namespace internal {