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

Merge fa24093789 into 89c3bc585c

Browse Source
This commit is contained in:
Alexander Bock 2017-07-10 19:19:35 +00:00 committed by GitHub
commit da57a13aa1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fmt/format.h
View File

@ -121,12 +121,27 @@ typedef __int64 intmax_t;
# define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__) # define FMT_GNUC_LIBSTD_VERSION (__GNUC_LIBSTD__ * 100 + __GNUC_LIBSTD_MINOR__)
#endif #endif
// GLM defines __has_feature to '0' which causes MSVC to throw C4574
// An #if check against __has_feature makes Clang unhappy, so the only way
// around this is to disable the warning for Microsoft Visual Studio
// Even though this is all macros, this will still work since it is the
// #ifdef __has_feature that throws the error, not the macro expansion
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable : 4574)
#endif // _MSC_VER
#ifdef __has_feature #ifdef __has_feature
# define FMT_HAS_FEATURE(x) __has_feature(x) # define FMT_HAS_FEATURE(x) __has_feature(x)
#else #else
# define FMT_HAS_FEATURE(x) 0 # define FMT_HAS_FEATURE(x) 0
#endif #endif
// And reenabling it afterwards
#ifdef _MSC_VER
#pragma warning (pop)
#endif // _MSC_VER
#ifdef __has_builtin #ifdef __has_builtin
# define FMT_HAS_BUILTIN(x) __has_builtin(x) # define FMT_HAS_BUILTIN(x) __has_builtin(x)
#else #else