diff options
Diffstat (limited to 'src/base/compiler.hh')
-rw-r--r-- | src/base/compiler.hh | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/base/compiler.hh b/src/base/compiler.hh index 1a104dd87..9cad07d7a 100644 --- a/src/base/compiler.hh +++ b/src/base/compiler.hh @@ -43,37 +43,8 @@ #ifndef __BASE_COMPILER_HH__ #define __BASE_COMPILER_HH__ -// gcc C++11 status: http://gcc.gnu.org/projects/cxx0x.html -// clang C++11 status: http://clang.llvm.org/cxx_status.html // http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html -/* Support for override control (final/override) */ -#undef M5_COMP_HAS_OVERRIDE_CONTROL - -#if defined(__GNUC__) && !defined(__clang__) /* Check for gcc */ - -# define M5_GCC_VERSION(maj, min) \ - (__GNUC__ > (maj) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min))) - -# define M5_COMP_HAS_OVERRIDE_CONTROL M5_GCC_VERSION(4, 7) - -#elif defined(__clang__) /* Check for clang */ - -# define M5_COMP_HAS_OVERRIDE_CONTROL __has_feature(cxx_override_control) - -#else -# error "Need to define compiler options in base/compiler.hh" -#endif - - -#if M5_COMP_HAS_OVERRIDE_CONTROL -# define M5_ATTR_FINAL final -# define M5_ATTR_OVERRIDE override -#else -# define M5_ATTR_FINAL -# define M5_ATTR_OVERRIDE -#endif - #if defined(__GNUC__) // clang or gcc # define M5_ATTR_NORETURN __attribute__((noreturn)) # define M5_DUMMY_RETURN |