diff options
| author | Peter Powell <petpow@saberuk.com> | 2013-05-16 14:22:23 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2013-05-16 16:43:35 +0100 |
| commit | 8e9abaaa7303f2f85b6a840bc80506313aee6b4f (patch) | |
| tree | 345d42b494e7deae802e8873f75c41e01f6632c0 /include/compat.h | |
| parent | 712a0e5ff36e5ba052c5d1accf5f5943be4a6e8a (diff) | |
Fix GCC warnings about using C++11 features when not in C++11 mode.
Diffstat (limited to 'include/compat.h')
| -rw-r--r-- | include/compat.h | 8 |
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 |