gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix undefined macro usage in cppformat.

Browse Source 
This is quite noisy with -Wexpansion-to-defined in both clang 3.9 and
gcc 7.
(Refs #3190 and #4148. Upstream might have fixed this, but somewhat
clean build logs seem worth it.)

Reviewed By: echotangoecho
Differential Revision: https://code.wildfiregames.com/D680
This was SVN commit r19884.
This commit is contained in:
leper
2017-07-08 00:15:03 +00:00
parent 7e3ff3af64
commit a5e253162b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/third_party/cppformat/format.h
Vendored
+8 -2
View File
@@ -81,9 +81,13 @@
// Variadic templates are available in GCC since version 4.4
// (http://gcc.gnu.org/projects/cxx0x.html) and in Visual C++
// since version 2013.
# if defined(_MSC_VER) && _MSC_VER >= 1800
# define FMT_USE_VARIADIC_TEMPLATES 1
# else
# define FMT_USE_VARIADIC_TEMPLATES \
(FMT_HAS_FEATURE(cxx_variadic_templates) || \
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1800))
(FMT_GCC_VERSION >= 404 && __cplusplus >= 201103))
# endif
#endif
#ifndef FMT_USE_RVALUE_REFERENCES
@@ -91,10 +95,12 @@
// as the latter doesn't provide std::move.
# if defined(FMT_GNUC_LIBSTD_VERSION) && FMT_GNUC_LIBSTD_VERSION <= 402
# define FMT_USE_RVALUE_REFERENCES 0
# elif defined(_MSC_VER) && _MSC_VER >= 1600
# define FMT_USE_RVALUE_REFERENCES 1
# else
# define FMT_USE_RVALUE_REFERENCES \
(FMT_HAS_FEATURE(cxx_rvalue_references) || \
(FMT_GCC_VERSION >= 403 && __cplusplus >= 201103) || (defined(_MSC_VER) && _MSC_VER >= 1600))
(FMT_GCC_VERSION >= 403 && __cplusplus >= 201103))
# endif
#endif