chrome/common/mac/objc_zombie.mm - Issue 11635050: Fix iOS build for XCode 4.6.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/mac/objc_zombie.mm

Issue 11635050: Fix iOS build for XCode 4.6. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: nits Created 7 years, 12 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:

Index: chrome/common/mac/objc_zombie.mm

diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm

index a0cd90e1e9da2b831182c9941008495d53278e17..b7cf512d6196b9073421ceee4c046df17448af2b 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 {