summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/compat.h8
1 files changed, 6 insertions, 2 deletions
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