summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-09-03 17:56:55 (GMT)
committerSwift Review <review@swift.im>2013-09-08 08:55:50 (GMT)
commita0ac7f269aeea190cbaa41210849d541dd6a5dcc (patch)
tree65e216769332cabe3e414db996a4bf46a7092ea3 /Swiften/EventLoop
parent89501a375eee58440906ebfbee1c112c4827bc73 (diff)
downloadswift-a0ac7f269aeea190cbaa41210849d541dd6a5dcc.zip
swift-a0ac7f269aeea190cbaa41210849d541dd6a5dcc.tar.bz2
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
Diffstat (limited to 'Swiften/EventLoop')
-rw-r--r--Swiften/EventLoop/Cocoa/CocoaEvent.h14
-rw-r--r--Swiften/EventLoop/Cocoa/CocoaEvent.mm5
2 files changed, 13 insertions, 6 deletions
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];