From ed69c0664a1e05bd8bc8d512da0c31c0f442df13 Mon Sep 17 00:00:00 2001 From: Paul Colton Date: Wed, 26 Mar 2014 12:57:42 -0700 Subject: [PATCH] reverted to nearly the original code, but had to find how to ignore method that doesn't call super: "#pragma clang diagnostic ignored "-Wobjc-missing-super-calls" --- src/Kernel/Third-Party/MAFuture/MAProxy.h | 4 ++-- src/Kernel/Third-Party/MAFuture/MAProxy.m | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/Kernel/Third-Party/MAFuture/MAProxy.h b/src/Kernel/Third-Party/MAFuture/MAProxy.h index 04a4578..fbb7470 100644 --- a/src/Kernel/Third-Party/MAFuture/MAProxy.h +++ b/src/Kernel/Third-Party/MAFuture/MAProxy.h @@ -3,8 +3,8 @@ int32_t _refcountMinusOne; } -//+ (id)alloc; -//- (void)dealloc; ++ (id)alloc; +- (void)dealloc; - (void)finalize; - (BOOL)isProxy; diff --git a/src/Kernel/Third-Party/MAFuture/MAProxy.m b/src/Kernel/Third-Party/MAFuture/MAProxy.m index 9f0394f..59b25a4 100644 --- a/src/Kernel/Third-Party/MAFuture/MAProxy.m +++ b/src/Kernel/Third-Party/MAFuture/MAProxy.m @@ -11,15 +11,19 @@ + (void)initialize // runtime requires an implementation } -//+ (id)alloc -//{ -// return NSAllocateObject(self, 0, NULL); -//} -// -//- (void)dealloc -//{ -// NSDeallocateObject(self); -//} ++ (id)alloc +{ + return NSAllocateObject(self, 0, NULL); +} + +// [super dealloc] not needed here because this class is manageing its own memory +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-missing-super-calls" +- (void)dealloc +{ + NSDeallocateObject(self); +} +#pragma clang diagnostic popk - (void)finalize {