External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 1104e1b2da into 9ff3b6af2e

Browse Source
This commit is contained in:
Remo 2018-06-10 17:19:37 +00:00 committed by GitHub
commit 633479a2a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/format.h
View File

@ -51,8 +51,9 @@
# define FMT_ICC_VERSION 0 # define FMT_ICC_VERSION 0
#endif #endif
#if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 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