|
|
@@ -24,12 +24,12 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
|
|
|
# define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__)
|
|
|
#endif
|
|
|
|
|
|
-#if !defined(__clang__) && defined(__GNUC__) && (GCC_VERSION < 460)
|
|
|
-# error VCMI requires at least gcc-4.6 for successful compilation or clang-3.1. Please update your compiler
|
|
|
+#if !defined(__clang__) && defined(__GNUC__) && (GCC_VERSION < 470)
|
|
|
+# error VCMI requires at least gcc-4.7.2 for successful compilation or clang-3.1. Please update your compiler
|
|
|
#endif
|
|
|
|
|
|
#if defined(__GNUC__) && (GCC_VERSION == 470 || GCC_VERSION == 471)
|
|
|
-# error This GCC version has buggy std::array::at version and should not be used. Please update to 4.7.2 or use 4.6.x.
|
|
|
+# error This GCC version has buggy std::array::at version and should not be used. Please update to 4.7.2 or later
|
|
|
#endif
|
|
|
|
|
|
/* ---------------------------------------------------------------------------- */
|
|
|
@@ -42,11 +42,6 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
|
|
|
# define CPP11_USE_INITIALIZERS_LIST
|
|
|
#endif
|
|
|
|
|
|
-//override keyword - not present in gcc-4.6
|
|
|
-#if !defined(_MSC_VER) && !defined(__clang__) && !(defined(__GNUC__) && (GCC_VERSION >= 470))
|
|
|
-# define override
|
|
|
-#endif
|
|
|
-
|
|
|
/* ---------------------------------------------------------------------------- */
|
|
|
/* Suppress some compiler warnings */
|
|
|
/* ---------------------------------------------------------------------------- */
|