Swiftdiff options
| -rw-r--r-- | Swiften/EventLoop/Cocoa/CocoaEvent.h | 14 | ||||
| -rw-r--r-- | Swiften/EventLoop/Cocoa/CocoaEvent.mm | 5 |
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,4 +1,4 @@ /* - * 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. @@ -14,5 +14,15 @@ namespace Swift { } -@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 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 @@ -3,8 +3,5 @@ #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 { |