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

fmtlib · May 10, 2018 · 46c374a · 46c374a
1 parent f0ae725
commit 46c374a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/fmt/core.h b/include/fmt/core.h
@@ -52,8 +52,8 @@
 // GCC doesn't allow throw in constexpr until version 6 (bug 67371).
 #ifndef FMT_USE_CONSTEXPR
 # define FMT_USE_CONSTEXPR \
-  (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_GCC_VERSION >= 600 || \
-   FMT_MSC_VER >= 1910)
+  (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VER >= 1910 || \
+   (FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L))
 #endif
 #if FMT_USE_CONSTEXPR
 # define FMT_CONSTEXPR constexpr

diff --git a/include/fmt/format.h b/include/fmt/format.h
@@ -116,7 +116,7 @@
 #endif
 
 #if FMT_USE_USER_DEFINED_LITERALS && \
-    (FMT_GCC_VERSION >= 600 || \
+    ((FMT_GCC_VERSION >= 600 && __cplusplus >= 201402L) || \
     (defined(FMT_CLANG_VERSION) && FMT_CLANG_VERSION >= 304))
 # define FMT_UDL_TEMPLATE 1
 #else