Overview
| Comment: | Merge trunk into branch "objfwtest" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | objfwtest |
| Files: | files | file ages | folders |
| SHA3-256: |
fa70ca352c36902d4e76c4c4ae70f20b |
| User & Date: | js on 2024-02-13 21:13:28 |
| Other Links: | branch diff | manifest | tags |
Context
|
2024-02-13
| ||
| 21:15 | ObjFWTest: Add OTOrderedDictionary check-in: b1a0bfe247 user: js tags: objfwtest | |
| 21:13 | Merge trunk into branch "objfwtest" check-in: fa70ca352c user: js tags: objfwtest | |
| 21:12 | Fix -[OFDictionary initWithKey:arguments:] check-in: bd1040a3aa user: js tags: trunk | |
| 19:45 | Remove some unneeded init methods from tests check-in: 7b5e4dedea user: js tags: objfwtest | |
Changes
Modified src/OFDictionary.m from [b6db2734d8] to [4417aedc0d].
| ︙ | ︙ | |||
315 316 317 318 319 320 321 322 323 324 325 326 327 328 |
if (count % 2 != 0)
@throw [OFInvalidArgumentException exception];
count /= 2;
objects = OFAllocMemory(count, sizeof(id));
keys = OFAllocMemory(count, sizeof(id));
while ((key = va_arg(arguments, id)) != nil &&
(object = va_arg(arguments, id)) != nil) {
OFEnsure(i < count);
objects[i] = object;
keys[i] = key;
| > > > > > > > > | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 |
if (count % 2 != 0)
@throw [OFInvalidArgumentException exception];
count /= 2;
objects = OFAllocMemory(count, sizeof(id));
keys = OFAllocMemory(count, sizeof(id));
keys[i] = firstKey;
objects[i] = va_arg(arguments, id);
if (objects[i] == nil)
@throw [OFInvalidArgumentException exception];
i++;
while ((key = va_arg(arguments, id)) != nil &&
(object = va_arg(arguments, id)) != nil) {
OFEnsure(i < count);
objects[i] = object;
keys[i] = key;
|
| ︙ | ︙ |
Modified src/OFMapTable.m from [810b88a011] to [3e827255d3].
| ︙ | ︙ | |||
24 25 26 27 28 29 30 | #import "OFMapTable+Private.h" #import "OFEnumerator.h" #import "OFEnumerationMutationException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 |
#import "OFMapTable+Private.h"
#import "OFEnumerator.h"
#import "OFEnumerationMutationException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
extern unsigned long OFHashSeed;
static const uint32_t minCapacity = 16;
struct OFMapTableBucket {
void *key, *object;
uint32_t hash;
};
|
| ︙ | ︙ |