diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-13 09:02:55 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-13 09:12:20 -0700 |
| commit | 9758f79a6c1ef7f662caca9c1df39de1934166b8 (patch) | |
| tree | fdffb18605692c990665f3e99a17dcb0efb09893 /runtime/base | |
| parent | c1020433660737d466b0d726bbeb86d9a279a44a (diff) | |
| download | art-9758f79a6c1ef7f662caca9c1df39de1934166b8.zip art-9758f79a6c1ef7f662caca9c1df39de1934166b8.tar.gz art-9758f79a6c1ef7f662caca9c1df39de1934166b8.tar.bz2 | |
Implement FINAL/OVERRIDE for clang.
Separate declaration from definition in certain places to work-around issues
with clang.
Remove bogus lock annotation at definition in compilers.cc that is already
present at the declaration.
Remove duplicate definition of ClassReference.
Change-Id: I5368057bb36319a259110b2198610d9d2b2e5041
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/macros.h b/runtime/base/macros.h index b193ff1..8175514 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -22,7 +22,7 @@ #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) // C++11 final and override keywords that were introduced in GCC version 4.7. -#if GCC_VERSION >= 40700 +#if defined(__clang__) || GCC_VERSION >= 40700 #define OVERRIDE override #define FINAL final #else |