Differences From Artifact [f14f82d06a]:
- File
src/OFObject.m
— part of check-in
[9ddd33a258]
at
2013-01-12 17:29:24
on branch trunk
— Rename *UsingEncoding: to *WithEncoding:.
This reverts 5362941.
Even though *UsingEncoding: is what Foundation uses, *WithEncoding: is
more natural and is more consistent with the rest. Also, this means this
restores it to the API of 0.7. (user: js, size: 24960) [annotate] [blame] [check-ins using]
To Artifact [431202d1e9]:
- File src/OFObject.m — part of check-in [85b8efadbc] at 2013-01-12 20:21:17 on branch trunk — Fix --disable-threads. (user: js, size: 25011) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
22 23 24 25 26 27 28 | #include <assert.h> #include <sys/time.h> #import "OFObject.h" #import "OFTimer.h" | > | > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #include <assert.h> #include <sys/time.h> #import "OFObject.h" #import "OFTimer.h" #ifdef OF_THREADS # import "OFThread.h" #endif #import "OFRunLoop.h" #import "OFAutoreleasePool.h" #import "OFAllocFailedException.h" #import "OFEnumerationMutationException.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" |
| ︙ | ︙ | |||
619 620 621 622 623 624 625 626 627 628 629 630 631 632 |
object: object1
object: object2
repeats: NO];
objc_autoreleasePoolPop(pool);
}
- (void)performSelector: (SEL)selector
onThread: (OFThread*)thread
waitUntilDone: (BOOL)waitUntilDone
{
void *pool = objc_autoreleasePoolPush();
OFTimer *timer = [OFTimer timerWithTimeInterval: 0
target: self
| > | 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 |
object: object1
object: object2
repeats: NO];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_THREADS
- (void)performSelector: (SEL)selector
onThread: (OFThread*)thread
waitUntilDone: (BOOL)waitUntilDone
{
void *pool = objc_autoreleasePoolPush();
OFTimer *timer = [OFTimer timerWithTimeInterval: 0
target: self
|
| ︙ | ︙ | |||
777 778 779 780 781 782 783 784 785 786 787 788 789 790 |
selector: selector
object: object1
object: object2
repeats: NO]];
objc_autoreleasePoolPop(pool);
}
- (const char*)typeEncodingForSelector: (SEL)selector
{
#if defined(OF_OBJFW_RUNTIME)
return objc_get_type_encoding(object_getClass(self), selector);
#else
Method m;
| > | 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 |
selector: selector
object: object1
object: object2
repeats: NO]];
objc_autoreleasePoolPop(pool);
}
#endif
- (const char*)typeEncodingForSelector: (SEL)selector
{
#if defined(OF_OBJFW_RUNTIME)
return objc_get_type_encoding(object_getClass(self), selector);
#else
Method m;
|
| ︙ | ︙ |