Overview
Comment: | Merge latest changes from default branch into 0.2 branch. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | 0.2 |
Files: | files | file ages | folders |
SHA3-256: |
c9a2f95a9cc3c6dedf6d7d77f21bed76 |
User & Date: | js on 2010-02-01 18:11:51 |
Other Links: | branch diff | manifest | tags |
Context
2010-02-03
| ||
10:39 | Fix VERSION in objfw-config.in in 0.2 branch. check-in: 5b535655f8 user: js tags: 0.2, 0.2-release | |
2010-02-01
| ||
18:11 | Merge latest changes from default branch into 0.2 branch. check-in: c9a2f95a9c user: js tags: 0.2 | |
2010-01-30
| ||
21:07 | Create 0.2 branch and remove unfinished XML stuff from it. check-in: 9a9211e963 user: js tags: 0.2 | |
Changes
Modified ChangeLog from [825d836d59] to [68dbb909a3].
|
Modified src/Makefile from [cffb8debfd] to [b004a3e1eb].
︙ | |||
27 28 29 30 31 32 33 | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | - | ${OFTHREAD_M} \ OFURLEncoding.m \ OFXMLElement.m \ OFXMLParser.m \ unicode.m INCLUDES := ${SRCS:.m=.h} \ |
︙ |
Modified src/OFArray.h from [f31644bdce] to [3e0b6e88ce].
︙ | |||
9 10 11 12 13 14 15 | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - | * the packaging of this file. */ #include <stdarg.h> #import "OFObject.h" #import "OFEnumerator.h" |
︙ | |||
46 47 48 49 50 51 52 | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | - + | * \return A new autoreleased OFArray */ + arrayWithObjects: (OFObject*)first, ...; /** * Creates a new OFArray with the objects from the specified C array. * |
︙ | |||
80 81 82 83 84 85 86 | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | - + | */ - initWithObject: (OFObject*)first argList: (va_list)args; /** * Initializes an OFArray with the objects from the specified C array. * |
︙ |
Modified src/OFDictionary.h from [520f646873] to [bbde3d4fc4].
︙ | |||
9 10 11 12 13 14 15 | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | - | * the packaging of this file. */ #include <stdarg.h> #import "OFObject.h" #import "OFEnumerator.h" |
︙ |
Modified src/OFEnumerator.h from [1e45836bf9] to [95bf700ece].
︙ | |||
22 23 24 25 26 27 28 | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | + + + + + + + + + + + + + + + + + + + + + + + + + + | /** * Resets the enumerator, so the next call to nextObject returns the first * object again. */ - reset; @end /* * This needs to be exactly like this because it's hardcoded in the compiler. * * We need this bad check to see if we already imported Cocoa, which defines * this as well. */ #define of_fast_enumeration_state_t NSFastEnumerationState #ifndef NSINTEGER_DEFINED typedef struct __of_fast_enumeration_state { unsigned long state; id *itemsPtr; unsigned long *mutationsPtr; unsigned long extra[5]; } of_fast_enumeration_state_t; #endif /** * The OFFastEnumeration protocol needs to be implemented by all classes * supporting fast enumeration. */ @protocol OFFastEnumeration - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state objects: (id*)objects count: (int)count; @end |
Deleted src/OFFastEnumeration.h version [7da30d91d4].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Modified src/OFMutableString.m from [5bfa0023ae] to [2a95dc6ba0].
︙ | |||
41 42 43 44 45 46 47 48 49 | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | + - - + + | size_t i, j, d; char *nstr; if (!is_utf8) { assert(table_size >= 1); uint8_t *p = (uint8_t*)*string + *length; uint8_t t; while (--p >= (uint8_t*)*string) |
︙ |
Modified src/OFObject.m from [695579ca2f] to [357eadb4d2].
whitespace changes only
Modified src/OFThread.m from [acb2745598] to [0239ec1e3d].
︙ | |||
65 66 67 68 69 70 71 | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | - + | @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - initWithObject: (OFObject <OFCopying>*)obj { self = [super init]; |
︙ |
Modified src/threading.h from [ec6d801a5e] to [bf0ea6d5c4].
︙ | |||
238 239 240 241 242 243 244 | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 | - + | #endif } static OF_INLINE BOOL of_spinlock_unlock(of_spinlock_t *s) { #if defined(OF_ATOMIC_OPS) |
︙ |