Overview
| Comment: | Make clang happy. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | runtime |
| Files: | files | file ages | folders |
| SHA3-256: |
931a8783ca3cf6ffa843301bfad69c15 |
| User & Date: | js on 2012-04-03 18:30:37 |
| Other Links: | branch diff | manifest | tags |
Context
|
2012-04-03
| ||
| 18:40 | Merge branch 'master' into runtime check-in: 6bad5d9148 user: js tags: runtime | |
| 18:30 | Make clang happy. check-in: 931a8783ca user: js tags: runtime | |
|
2012-03-23
| ||
| 15:42 | rootclass->isa->superclass is rootclass. check-in: aa179b6d0a user: js tags: runtime | |
Changes
Modified src/OFBlock.m from [100cdf479d] to [36beda4104].
| ︙ | ︙ | |||
79 80 81 82 83 84 85 |
enum objc_abi_class_info {
OBJC_CLASS_INFO_CLASS = 0x01,
OBJC_CLASS_INFO_METACLASS = 0x02
};
#endif
#if defined(OF_OBJFW_RUNTIME)
| | | | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
enum objc_abi_class_info {
OBJC_CLASS_INFO_CLASS = 0x01,
OBJC_CLASS_INFO_METACLASS = 0x02
};
#endif
#if defined(OF_OBJFW_RUNTIME)
extern void __objc_exec_class(struct objc_abi_module*);
/* Begin of ObjC module */
static struct objc_abi_class _NSConcreteStackBlock_metaclass = {
(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFStackBlock", 8,
OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
};
struct objc_abi_class _NSConcreteStackBlock = {
&_NSConcreteStackBlock_metaclass, "OFBlock", "OFStackBlock", 8,
OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
};
static struct objc_abi_class _NSConcreteGlobalBlock_metaclass = {
(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFGlobalBlock", 8,
OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
};
struct objc_abi_class _NSConcreteGlobalBlock = {
&_NSConcreteGlobalBlock_metaclass, "OFBlock", "OFGlobalBlock",
8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
};
static struct objc_abi_class _NSConcreteMallocBlock_metaclass = {
(struct objc_abi_class*)(void*)"OFBlock", "OFBlock", "OFMallocBlock", 8,
OBJC_CLASS_INFO_METACLASS, sizeof(struct objc_abi_class), NULL, NULL
};
struct objc_abi_class _NSConcreteMallocBlock = {
&_NSConcreteMallocBlock_metaclass, "OFBlock", "OFMallocBlock",
8, OBJC_CLASS_INFO_CLASS, sizeof(of_block_literal_t), NULL, NULL
};
|
| ︙ | ︙ |
Modified src/OFObject.m from [946762df81] to [26d577e585].
| ︙ | ︙ | |||
414 415 416 417 418 419 420 |
struct objc_method_list *methodlist;
for (methodlist = class->isa->methodlist;
methodlist != NULL; methodlist = methodlist->next) {
int i;
for (i = 0; i < methodlist->count; i++) {
| | | | 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 |
struct objc_method_list *methodlist;
for (methodlist = class->isa->methodlist;
methodlist != NULL; methodlist = methodlist->next) {
int i;
for (i = 0; i < methodlist->count; i++) {
SEL selector = (SEL)&methodlist->methods[i].sel;
/*
* Don't replace methods implemented in receiving class.
*/
if ([self methodForSelector: selector] !=
[superclass methodForSelector: selector])
continue;
[self replaceClassMethod: selector
withMethodFromClass: class];
}
}
for (methodlist = class->methodlist; methodlist != NULL;
methodlist = methodlist->next) {
int i;
for (i = 0; i < methodlist->count; i++) {
SEL selector = (SEL)&methodlist->methods[i].sel;
/*
* Don't replace methods implemented in receiving class.
*/
if ([self instanceMethodForSelector: selector] !=
[superclass instanceMethodForSelector: selector])
continue;
|
| ︙ | ︙ |