summaryrefslogtreecommitdiffstats
path: root/chrome/common/mac
diff options
context:
space:
mode:
authorjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 07:29:41 +0000
committerjustincohen@google.com <justincohen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-02 07:29:41 +0000
commitcf97f286f1dac079586ff772da7ba941a6dd582c (patch)
treee9f2ec081576a68c24240e1f197894f5a7bbbaea /chrome/common/mac
parenta17ae46a1813f01fdf0c35ffa189d31f375ab153 (diff)
downloadchromium_src-cf97f286f1dac079586ff772da7ba941a6dd582c.zip
chromium_src-cf97f286f1dac079586ff772da7ba941a6dd582c.tar.gz
chromium_src-cf97f286f1dac079586ff772da7ba941a6dd582c.tar.bz2
Remove iOS specific define to avoid objc_root_class in CrZombie.
Getting ready for ninja iOS builds. BUG=227896 Review URL: https://chromiumcodereview.appspot.com/14785002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/mac')
-rw-r--r--chrome/common/mac/objc_zombie.mm9
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/common/mac/objc_zombie.mm b/chrome/common/mac/objc_zombie.mm
index b7cf512..b71cda7 100644
--- a/chrome/common/mac/objc_zombie.mm
+++ b/chrome/common/mac/objc_zombie.mm
@@ -31,16 +31,7 @@ OBJC_EXPORT void *objc_destructInstance(id obj);
// inherited methods (|NSObject| is like a category magnet!).
// Without the __attribute__, clang's -Wobjc-root-class warns on the missing
// superclass.
-//
-// 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.
-// 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 {
Class isa;
}