From 265b40ec6e9469502c812fe734fe319bb6a8d78a Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Wed, 16 Apr 2014 09:19:31 -0700 Subject: [PATCH] Disable GCC warning about "long long". --- format.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/format.h b/format.h index 00a4a2f3..4124981b 100644 --- a/format.h +++ b/format.h @@ -45,6 +45,12 @@ #ifdef __GNUC__ # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) # define FMT_GCC_EXTENSION __extension__ +// Disable warning about "long long" which is sometimes reported even +// when using __extension__. +# if FMT_GCC_VERSION >= 406 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wlong-long" +# endif #else # define FMT_GCC_EXTENSION #endif @@ -1517,7 +1523,10 @@ std::wstring Format(const WStringRef &format, const Args & ... args) { } -#if _MSC_VER +// Restore warnings. +#if FMT_GCC_VERSION >= 406 +# pragma GCC diagnostic pop +#elif _MSC_VER # pragma warning(pop) #endif