From 8e9abaaa7303f2f85b6a840bc80506313aee6b4f Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Thu, 16 May 2013 14:22:23 +0100
Subject: Fix GCC warnings about using C++11 features when not in C++11 mode.

---
 include/compat.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/compat.h b/include/compat.h
index d3d554b18..299b32a88 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -49,12 +49,16 @@
  * These macros enable the use of the C++11 override control keywords in
  * compilers which support them.
  */
-#if defined __clang__
+#if __cplusplus >= 201103L
+# define HAS_CXX11_FINAL_OVERRIDE
+#elif defined __clang__
 # if __has_feature(cxx_override_control)
 #  define HAS_CXX11_FINAL_OVERRIDE
 # endif
 #elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
-# define HAS_CXX11_FINAL_OVERRIDE
+# if defined __GXX_EXPERIMENTAL_CXX0X__
+#  define HAS_CXX11_FINAL_OVERRIDE
+# endif
 #elif _MSC_VER >= 1700
 # define HAS_CXX11_FINAL_OVERRIDE
 #endif
-- 
cgit v1.3.1-10-gc9f91