summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 20:09:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 20:09:53 +0000
commit914ffd1b0df70567e0464b14fa7624546c4e0089 (patch)
tree9110e05b7cc0e4765815d010325ea93309d2b29f /base
parent872ad5f4027f4eecf4b037d353069ad1b37841b6 (diff)
downloadchromium_src-914ffd1b0df70567e0464b14fa7624546c4e0089.zip
chromium_src-914ffd1b0df70567e0464b14fa7624546c4e0089.tar.gz
chromium_src-914ffd1b0df70567e0464b14fa7624546c4e0089.tar.bz2
Disable OVERRIDE for clang for a while.
This blocks rolling clang, and I need to roll clang for the plugin stuff. BUG=71088 TEST=none Review URL: http://codereview.chromium.org/6329027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/compiler_specific.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index 017b869..fd2b083 100644
--- a/base/compiler_specific.h
+++ b/base/compiler_specific.h
@@ -84,8 +84,9 @@
// virtual void foo() OVERRIDE;
#if defined(COMPILER_MSVC)
#define OVERRIDE override
-#elif defined(__clang__)
-#define OVERRIDE __attribute__((override))
+// TODO(thakis): Reenable this, http://crbug.com/71088
+//#elif defined(__clang__)
+//#define OVERRIDE __attribute__((override))
#else
#define OVERRIDE
#endif