From a0ac7f269aeea190cbaa41210849d541dd6a5dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be> Date: Tue, 3 Sep 2013 19:56:55 +0200 Subject: Use (deprecated) declaration of ivars in interface This is necessary for supporting 'legacy' Objective-C runtimes (e.g. OS X 32-bit). Partly reverts 88153286ea2f11fea24b950e7dbb0075ceb49a54. Change-Id: Ibc6e1dad255ae8e36b946ef4c792c0f272c73d71 diff --git a/Swiften/EventLoop/Cocoa/CocoaEvent.h b/Swiften/EventLoop/Cocoa/CocoaEvent.h index d396678..89d056f 100644 --- a/Swiften/EventLoop/Cocoa/CocoaEvent.h +++ b/Swiften/EventLoop/Cocoa/CocoaEvent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Remko Tronçon + * Copyright (c) 2010-2013 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ @@ -13,7 +13,17 @@ namespace Swift { class CocoaEventLoop; } -@interface CocoaEvent : NSObject +// Using deprecated declaration of instance vars in interface, because this +// is required for older runtimes (e.g. 32-bit Mac OS X) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-interface-ivars" + +@interface CocoaEvent : NSObject { + Swift::Event* event; + Swift::CocoaEventLoop* eventLoop; +} + +#pragma clang diagnostic pop // Takes ownership of event - (id) initWithEvent: (Swift::Event*) e eventLoop: (Swift::CocoaEventLoop*) el; diff --git a/Swiften/EventLoop/Cocoa/CocoaEvent.mm b/Swiften/EventLoop/Cocoa/CocoaEvent.mm index 05fd2a0..7b1b4b0 100644 --- a/Swiften/EventLoop/Cocoa/CocoaEvent.mm +++ b/Swiften/EventLoop/Cocoa/CocoaEvent.mm @@ -2,10 +2,7 @@ #include <Swiften/EventLoop/Event.h> #include <Swiften/EventLoop/Cocoa/CocoaEventLoop.h> -@implementation CocoaEvent { - Swift::Event* event; - Swift::CocoaEventLoop* eventLoop; -} +@implementation CocoaEvent - (id) initWithEvent: (Swift::Event*) e eventLoop: (Swift::CocoaEventLoop*) el { self = [super init]; -- cgit v0.10.2-6-g49f6