Differences From Artifact [ed8d42f32f]:
- File
tests/OFDictionaryTests.m
— part of check-in
[7e29a62cc6]
at
2017-10-14 18:52:37
on branch trunk
— Fix more shadowed variables
Clang didn't complain about these, but GCC did. (user: js, size: 10049) [annotate] [blame] [check-ins using] [more...]
To Artifact [ca0fda1cc3]:
- File
tests/OFDictionaryTests.m
— part of check-in
[2f4e0df8be]
at
2017-10-17 00:33:37
on branch trunk
— Do not use implicit method return types
Instead, explicitly declare them, as OF_ASSUME_NONNULL_{BEGIN,END} does
not apply to implicit return types. This means that after this commit,
all init methods have a nonnull return type, as they should have. (user: js, size: 10091) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
46 47 48 49 50 51 52 |
@interface SimpleMutableDictionary: OFMutableDictionary
{
OFMutableDictionary *_dictionary;
}
@end
@implementation SimpleDictionary
| | | | | | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
@interface SimpleMutableDictionary: OFMutableDictionary
{
OFMutableDictionary *_dictionary;
}
@end
@implementation SimpleDictionary
- (instancetype)init
{
self = [super init];
@try {
_dictionary = [[OFMutableDictionary alloc] init];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithKey: (id)key
arguments: (va_list)arguments
{
self = [super init];
@try {
_dictionary = [[OFMutableDictionary alloc]
initWithKey: key
arguments: arguments];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithObjects: (const id *)objects
forKeys: (const id *)keys_
count: (size_t)count
{
self = [super init];
@try {
_dictionary = [[OFMutableDictionary alloc]
initWithObjects: objects
forKeys: keys_
|
| ︙ | ︙ |