gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

get code to compile/link again

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35004 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-03-27 10:03:40 +00:00
parent abb5a4dd3e
commit cd57095d65
5 changed files with 66 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Source/NSOperation.m
View file

@ -42,7 +42,7 @@
BOOL blocked; \
BOOL ready; \
NSMutableArray *dependencies; \
GSOperationCompletionBlock completionBlock
GSOperationCompletionBlock completionBlock;
#define GS_NSOperationQueue_IVARS \
NSRecursiveLock *lock; \
@ -189,6 +189,11 @@ static NSArray *empty = nil;
}
}
- (GSOperationCompletionBlock) completionBlock
{
return internal->completionBlock;
}
- (void) dealloc
{
if (internal != nil)
@ -354,6 +359,12 @@ static NSArray *empty = nil;
[internal->lock unlock];
}
- (void) setCompletionBlock: (GSOperationCompletionBlock)aBlock
{
internal->completionBlock = aBlock;
GSPrintf(stderr, @"Setting block: %p", internal->completionBlock);
}
- (void) setQueuePriority: (NSOperationQueuePriority)pri
{
if (pri <= NSOperationQueuePriorityVeryLow)
@ -397,18 +408,6 @@ static NSArray *empty = nil;
internal->threadPriority = pri;
}
- (void) setCompletionBlock:(GSOperationCompletionBlock)aBlock
{
ASSIGN(internal->completionBlock, aBlock);
GSPrintf(stderr, @"Setting block: %p", internal->completionBlock);
}
- (GSOperationCompletionBlock)completionBlock
{
return internal->completionBlock;
}
- (void) start
{
NSAutoreleasePool *pool = [NSAutoreleasePool new];
@ -537,11 +536,11 @@ static NSArray *empty = nil;
internal->finished = YES;
[self didChangeValueForKey: @"isFinished"];
}
if (NULL != internal->completionBlock)
{
GSPrintf(stderr, @"Calling block: %p", internal->completionBlock);
CALL_BLOCK_NO_ARGS(internal->completionBlock);
}
if (NULL != internal->completionBlock)
{
GSPrintf(stderr, @"Calling block: %p", internal->completionBlock);
CALL_BLOCK_NO_ARGS(internal->completionBlock);
}
}
[internal->lock unlock];
[self release];