feedc0de/fmt
1
0
Fork 0
forked from fmtlib/fmt
Code Pull Requests Activity

Fix compilation with new gcc and -std=c++11 (#734)

Browse Source
This commit is contained in:
Victor Zverovich
2018-05-09 20:58:05 -07:00
parent f0ae725721
commit 46c374a8a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/core.h
View File

@ -52,8 +52,8 @@
// GCC doesn't allow throw in constexpr until version 6 (bug 67371). // GCC doesn't allow throw in constexpr until version 6 (bug 67371).
#ifndef FMT_USE_CONSTEXPR #ifndef FMT_USE_CONSTEXPR
# define FMT_USE_CONSTEXPR \ # define FMT_USE_CONSTEXPR \
(FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_GCC_VERSION >= 600 || \ (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VER >= 1910 || \
FMT_MSC_VER >= 1910) (FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L))
#endif #endif
#if FMT_USE_CONSTEXPR #if FMT_USE_CONSTEXPR
# define FMT_CONSTEXPR constexpr # define FMT_CONSTEXPR constexpr

2
include/fmt/format.h
View File

@ -116,7 +116,7 @@
#endif #endif
#if FMT_USE_USER_DEFINED_LITERALS && \ #if FMT_USE_USER_DEFINED_LITERALS && \
(FMT_GCC_VERSION >= 600 || \ ((FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L) || \
(defined(FMT_CLANG_VERSION) && FMT_CLANG_VERSION >= 304)) (defined(FMT_CLANG_VERSION) && FMT_CLANG_VERSION >= 304))
# define FMT_UDL_TEMPLATE 1 # define FMT_UDL_TEMPLATE 1
#else #else