Skip to content

Commit

Permalink
reverted to nearly the original code, but had to find how to ignore m…
Browse files Browse the repository at this point in the history
…ethod that doesn't call super: "#pragma clang diagnostic ignored "-Wobjc-missing-super-calls"
  • Loading branch information
Paul Colton committed Mar 26, 2014
1 parent 47a5faf commit ed69c06
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/Kernel/Third-Party/MAFuture/MAProxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
int32_t _refcountMinusOne;
}

//+ (id)alloc;
//- (void)dealloc;
+ (id)alloc;
- (void)dealloc;

- (void)finalize;
- (BOOL)isProxy;
Expand Down
22 changes: 13 additions & 9 deletions src/Kernel/Third-Party/MAFuture/MAProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit ed69c06

Please sign in to comment.