Moved core.h before GCC version test.

Using FMT_GCC_VERSION from core.h to test GCC version.
This commit is contained in:
Remotion 2018-06-10 13:58:35 +02:00
parent 8721e4c3a6
commit 1104e1b2da

View File

@ -51,8 +51,9 @@
# define FMT_ICC_VERSION 0 # define FMT_ICC_VERSION 0
#endif #endif
#if (defined(__GNUC__) && !defined(__clang__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406) || \ #include "core.h"
FMT_CLANG_VERSION
#if (FMT_GCC_VERSION >= 406) || FMT_CLANG_VERSION
# pragma GCC diagnostic push # pragma GCC diagnostic push
// Disable the warning about declaration shadowing because it affects too // Disable the warning about declaration shadowing because it affects too
@ -64,8 +65,6 @@
# pragma GCC diagnostic ignored "-Wsign-conversion" # pragma GCC diagnostic ignored "-Wsign-conversion"
#endif #endif
#include "core.h"
#ifdef _SECURE_SCL #ifdef _SECURE_SCL
# define FMT_SECURE_SCL _SECURE_SCL # define FMT_SECURE_SCL _SECURE_SCL
#else #else