Differences From Artifact [773b906c93]:
- File
src/OFDictionary_hashtable.m
— part of check-in
[13ee56edf3]
at
2014-06-21 21:43:43
on branch trunk
— Move all macros from OFObject.h to macros.h
This means that OFObject.h imports macros.h now, making it unnecessary
to manually import macros.h in almost every file. And while at it, also
import autorelease.h in OFObject.h, so that this doesn't need to be
manually imported in almost every file as well. (user: js, size: 8919) [annotate] [blame] [check-ins using]
To Artifact [29f3ee3bba]:
- File
src/OFDictionary_hashtable.m
— part of check-in
[2ecede1f96]
at
2014-07-16 17:02:30
on branch trunk
— Fix check in -[OFDictionary_hashtable isEqual:]
Instead of checking the passed dictionary, this checked self, which of
course would always be of type OFDictionary_hashtable.While at it, use -[isKindOfClass:] instead for the check. (user: js, size: 8957) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
99 100 101 102 103 104 105 |
- initWithDictionary: (OFDictionary*)dictionary
{
size_t count;
if (dictionary == nil)
return [self init];
| | | | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
- initWithDictionary: (OFDictionary*)dictionary
{
size_t count;
if (dictionary == nil)
return [self init];
if ([dictionary isKindOfClass: [OFDictionary_hashtable class]] ||
[dictionary isKindOfClass: [OFMutableDictionary_hashtable class]]) {
self = [super init];
@try {
OFDictionary_hashtable *dictionary_ =
(OFDictionary_hashtable*)dictionary;
_mapTable = [dictionary_->_mapTable copy];
|
| ︙ | ︙ | |||
310 311 312 313 314 315 316 |
return [_mapTable count];
}
- (bool)isEqual: (id)dictionary
{
OFDictionary_hashtable *dictionary_;
| | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 |
return [_mapTable count];
}
- (bool)isEqual: (id)dictionary
{
OFDictionary_hashtable *dictionary_;
if (![dictionary isKindOfClass: [OFDictionary_hashtable class]] &&
![dictionary isKindOfClass: [OFMutableDictionary_hashtable class]])
return [super isEqual: dictionary];
dictionary_ = (OFDictionary_hashtable*)dictionary;
return [dictionary_->_mapTable isEqual: _mapTable];
}
|
| ︙ | ︙ |