Differences From Artifact [c81ffb2e26]:
- File src/OFDictionary.m — part of check-in [daae7ffbf3] at 2010-01-30 15:47:44 on branch trunk — Make OFEnumerator more general, implement it for OFArray & OFDictionary. (user: js, size: 12349) [annotate] [blame] [check-ins using]
To Artifact [b35f643373]:
- File
src/OFDictionary.m
— part of check-in
[b91a8283fe]
at
2010-03-05 11:52:18
on branch 0.2
— Merge a few changesets from the default branch into the 0.2 branch.
Changesets:
* b95fcaa6d694
* 804c68d222b4
* da8cd738da3d
* 1109d5ce3419
* d03f5c1ca95d
* 2a7017722165
* 4fccdc79eeb7
* d228149fbc04
* 8782d412a4a6 (user: js, size: 12381) [annotate] [blame] [check-ins using]
1 | /* | | | 1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2008 - 2010 * Jonathan Schleifer <js@webkeks.org> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. |
| ︙ | ︙ | |||
581 582 583 584 585 586 587 588 589 590 591 592 593 594 |
OF_HASH_FINALIZE(hash);
return hash;
}
@end
@implementation OFDictionaryEnumerator
- initWithData: (struct of_dictionary_bucket*)data_
size: (size_t)size_
mutationsPointer: (unsigned long*)mutations_ptr_
{
self = [super init];
| > | 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 |
OF_HASH_FINALIZE(hash);
return hash;
}
@end
/// \cond internal
@implementation OFDictionaryEnumerator
- initWithData: (struct of_dictionary_bucket*)data_
size: (size_t)size_
mutationsPointer: (unsigned long*)mutations_ptr_
{
self = [super init];
|
| ︙ | ︙ | |||
636 637 638 639 640 641 642 | if (pos < size) return data[pos++].key; else return nil; } @end | > | 637 638 639 640 641 642 643 644 | if (pos < size) return data[pos++].key; else return nil; } @end /// \endcond |