Merge branch 'master' of github.com:fmtlib/fmt

221b08fd · Victor Zverovich · fa9066fe · 90ff31b3 · 221b08fd
Commit 221b08fd authored Apr 22, 2018 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/fmt/format.h include/fmt/format.h +1 -1

No files found.
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -131,7 +131,7 @@
 # endif
 #endif

-#if FMT_HAS_GXX_CXX11 || FMT_MSC_VER >= 1600
+#if FMT_HAS_GXX_CXX11 || FMT_HAS_FEATURE(cxx_trailing_return) || FMT_MSC_VER >= 1600
 # define FMT_USE_TRAILING_RETURN 1
 #endif