fix c++14 compiler detation

HAVE_CXX14 is most likeley meaningless on msvc, so we move the msvc out of HAVE_CXX14. Also fixes the indention of the other code.
wesnoth · Apr 1, 2016 · 7e204d1 · 7e204d1
1 parent 59a8682
commit 7e204d1
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/src/config.hpp b/src/config.hpp
@@ -51,25 +51,23 @@
 #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+
-#			define USE_HETEROGENOUS_LOOKUPS
-#		endif
-#	else // Non-Apple clang
-#		if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3 // clang 3.4+
-#			define USE_HETEROGENOUS_LOOKUPS
+#	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+
+#				define USE_HETEROGENOUS_LOOKUPS
+#			endif
+#		else // Non-Apple clang
+#			if (__clang_major__ == 3 && __clang_minor__ >= 4) || __clang_major__ > 3 // clang 3.4+
+#				define USE_HETEROGENOUS_LOOKUPS
+#			endif
 #		endif
+#	elif defined(__GNUC__) && __GNUC__ >= 5 // GCC 5.0+
+#		define USE_HETEROGENOUS_LOOKUPS
 #	endif
-#elif defined(__GNUC__) && __GNUC__ >= 5 // GCC 5.0+
-#	define USE_HETEROGENOUS_LOOKUPS
 #elif defined(_MSC_VER) && _MSC_VER >= 1900 // MSVC 2015
 #	define USE_HETEROGENOUS_LOOKUPS
 #endif
 
-#endif
-
 class config;
 class enum_tag;