Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Unified Diff: base/compiler_specific.h

Issue 6250188: Roll clang to r124477. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/compiler_specific.h
diff --git a/base/compiler_specific.h b/base/compiler_specific.h
index fd2b083f1b7c4b8e45ad79a559a058e9b1cd62be..30603065b7004353a7e1d350eb4c276952e7565a 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
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698