diff options
| author | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 21:57:10 +0000 |
|---|---|---|
| committer | justincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 21:57:10 +0000 |
| commit | 391aff7c9ac5ed9bd3b02f3b89e2eed63b37ede3 (patch) | |
| tree | fd87d2bca4557559a359aa02f0997513143d85f5 /chrome/common/mac | |
| parent | 39339b69dda2d54b0cf8984e6a83e777641974d8 (diff) | |
| download | chromium_src-391aff7c9ac5ed9bd3b02f3b89e2eed63b37ede3.zip chromium_src-391aff7c9ac5ed9bd3b02f3b89e2eed63b37ede3.tar.gz chromium_src-391aff7c9ac5ed9bd3b02f3b89e2eed63b37ede3.tar.bz2 | |
Fix iOS build for XCode 4.6.
The new clang has some bug fixes and is slightly pickier about
unused variables.
BUG=NONE
TBR=mark
Review URL: https://chromiumcodereview.appspot.com/11635050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
| -rw-r--r-- | chrome/common/mac/objc_zombie.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm index a0cd90e..b7cf512 100644 --- a/chrome/common/mac/objc_zombie.mm +++ b/chrome/common/mac/objc_zombie.mm @@ -35,7 +35,10 @@ OBJC_EXPORT void *objc_destructInstance(id obj); // The version of clang that ships with Xcode 4.5 does not include this // warning, so it is disabled on iOS. This may change in future Xcode // releases. -#if !defined(OS_IOS) +// TODO(justincohen): This is fixed in clang 4.2 in XCode 4.6. Remove this +// once everyone is moved to XCode 4.6 b/7882496. +#if !defined(OS_IOS) || \ + (__clang_major__ > 4 || (__clang_major__ == 4 && __clang_minor__ >= 2)) __attribute__((objc_root_class)) #endif @interface CrZombie { |