From 9758f79a6c1ef7f662caca9c1df39de1934166b8 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 13 Mar 2014 09:02:55 -0700 Subject: 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 --- runtime/base/macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/base') 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 -- cgit v1.1