diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 17:09:03 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-07 17:09:03 +0000 |
| commit | ad67f979e1b4c0a8e61065681a4b6594d6570067 (patch) | |
| tree | fdb839da4a4ee35cf50d8e44cd9698a93c829421 | |
| parent | adb6a84d765332811ab4dbd1eee8366066574d79 (diff) | |
| download | chromium_src-ad67f979e1b4c0a8e61065681a4b6594d6570067.zip chromium_src-ad67f979e1b4c0a8e61065681a4b6594d6570067.tar.gz chromium_src-ad67f979e1b4c0a8e61065681a4b6594d6570067.tar.bz2 | |
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
| -rw-r--r-- | base/compiler_specific.h | 5 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 2 |
2 files changed, 3 insertions, 4 deletions
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 diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 256b999..b9ebad9 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -5,7 +5,7 @@ # This script will check out llvm and clang into third_party/llvm and build it. -CLANG_REVISION=124227 +CLANG_REVISION=124477 THIS_DIR=$(dirname $0) LLVM_DIR=$THIS_DIR/../../../third_party/llvm |