commit 54ad9024c91be28d73fb032d1b07bcc871888120
author thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Tue Feb 08 02:09:03 2011 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 11:06:55 2020 +0900
tree c79e1c1ff0de6e4492812bb8bf2eb4f6981a25b9
parent 1ae6e0dd9aebfccee3978041e513e744117114d6

Roll clang to r124477.

Also reenable OVERRIDE.

BUG=71088
TEST=none

Review URL: http://codereview.chromium.org/6250188

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73994 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: ad67f979e1b4c0a8e61065681a4b6594d6570067

base/compiler_specific.h

diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index fd2b083..3060306 100644
--- a/base/compiler_specific.h
+++ b/base/compiler_specific.h
@@ -84,9 +84,8 @@
 //   virtual void foo() OVERRIDE;
 #if defined(COMPILER_MSVC)
 #define OVERRIDE override
-// TODO(thakis): Reenable this, http://crbug.com/71088
-//#elif defined(__clang__)
-//#define OVERRIDE __attribute__((override))
+#elif defined(__clang__)
+#define OVERRIDE override
 #else
 #define OVERRIDE
 #endif