Guards around C++14 code

wesnoth · Apr 1, 2016 · 390aa20 · 390aa20
1 parent 1ff7b5f
commit 390aa20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/config.hpp b/src/config.hpp
@@ -50,6 +50,8 @@
 #include "exceptions.hpp"
 #include "tstring.hpp"
 
+#ifdef HAVE_CXX14
+
 #ifdef __clang__ // Check this first, because clang also defines __GNUC__
 #	ifdef __apple_build_version__ // Apple clang
 #		if (__clang_major__ == 5 && __clang_minor__ >= 1) || __clang_major__ > 5 // Apple clang 5.1+
@@ -66,6 +68,8 @@
 #	define USE_HETEROGENOUS_LOOKUPS
 #endif
 
+#endif
+
 class config;
 class enum_tag;
 

diff --git a/src/global.hpp b/src/global.hpp
@@ -55,4 +55,9 @@
 
 #define UNUSED(x)  ((void)(x))     /* to avoid warnings */
 
+// To allow using some optional C++14 features
+#if __cplusplus >= 201402L
+#define HAVE_CXX14
+#endif
+
 #endif //GLOBAL_HPP_INCLUDED