From df828f88da6cb3da11848bc25686b43c78a346fd Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Thu, 15 Mar 2018 09:55:31 -0400 Subject: [PATCH] Don't define FMT_GCC_VERSION on clang --- include/fmt/core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/fmt/core.h b/include/fmt/core.h index 314bd949..6a954cca 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -30,7 +30,7 @@ # define FMT_HAS_INCLUDE(x) 0 #endif -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__clang__) # define FMT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) #else # define FMT_GCC_VERSION 0 @@ -966,7 +966,7 @@ class arg_store { public: static const uint64_t TYPES; -#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 405 && !defined(__clang__) +#if FMT_GCC_VERSION && FMT_GCC_VERSION <= 405 // Workaround an array initialization bug in gcc 4.5 and earlier. arg_store(const Args &... args) { data_ = {internal::make_arg(args)...};