Overview
Comment: | Fix conflicting types. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
6c16e03d937a7d750cd6d9ebe888412d |
User & Date: | js on 2012-09-20 00:05:55 |
Other Links: | manifest | tags |
Context
2012-09-20
| ||
00:06 | ObjC 1 fix. check-in: 932eb2bd6f user: js tags: trunk | |
00:05 | Fix conflicting types. check-in: 6c16e03d93 user: js tags: trunk | |
2012-09-19
| ||
23:57 | Make async connecting possible without blocks. check-in: 4f149012e9 user: js tags: trunk | |
Changes
Modified src/OFDate.m from [91f4360e05] to [8b872152c8].
︙ | ︙ | |||
383 384 385 386 387 388 389 | } - copy { return [self retain]; } | | | | 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 | } - copy { return [self retain]; } - (of_comparison_result_t)compare: (id <OFComparing>)object { OFDate *otherDate; if (![object isKindOfClass: [OFDate class]]) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; otherDate = (OFDate*)object; if (seconds < otherDate->seconds) return OF_ORDERED_ASCENDING; if (seconds > otherDate->seconds) return OF_ORDERED_DESCENDING; return OF_ORDERED_SAME; |
︙ | ︙ |
Modified src/OFNumber.m from [5743167b4f] to [13adfb2ee6].
︙ | ︙ | |||
934 935 936 937 938 939 940 | if (type & OF_NUMBER_SIGNED || number->type & OF_NUMBER_SIGNED) return ([number intMaxValue] == [self intMaxValue]); return ([number uIntMaxValue] == [self uIntMaxValue]); } | | | | 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 | if (type & OF_NUMBER_SIGNED || number->type & OF_NUMBER_SIGNED) return ([number intMaxValue] == [self intMaxValue]); return ([number uIntMaxValue] == [self uIntMaxValue]); } - (of_comparison_result_t)compare: (id <OFComparing>)object { OFNumber *number; if (![object isKindOfClass: [OFNumber class]]) @throw [OFInvalidArgumentException exceptionWithClass: [self class] selector: _cmd]; number = (OFNumber*)object; if (type & OF_NUMBER_FLOAT || number->type & OF_NUMBER_FLOAT) { double double1 = [self doubleValue]; double double2 = [number doubleValue]; if (double1 > double2) return OF_ORDERED_DESCENDING; |
︙ | ︙ |