ObjFW  Check-in [262b3c5801]

Overview
Comment:OF{Pair,Triple}: Add designated initializer
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 262b3c580188b5dd3ee2bb6019d57c4880d33a38f8d1e3a4233b7345f2080c23
User & Date: js on 2017-10-17 21:06:30
Other Links: manifest | tags
Context
2017-10-19
20:21
OFSystemInfo: Prevent instantiation check-in: 9f372df30f user: js tags: trunk
2017-10-17
21:06
OF{Pair,Triple}: Add designated initializer check-in: 262b3c5801 user: js tags: trunk
21:02
OFMutableSet: Add missing override for -[copy] check-in: 7dfb3c2c89 user: js tags: trunk
Changes

Modified src/OFPair.h from [2a7841384c] to [af50510417].

60
61
62
63
64
65
66
67

68
69
70
71
72
73
74
75
76
 * @brief Initializes an already allocated OFPair with the specified objects.
 *
 * @param firstObject The first object for the pair
 * @param secondObject The second object for the pair
 * @return An initialized OFPair
 */
- (instancetype)initWithFirstObject: (nullable FirstType)firstObject
		       secondObject: (nullable SecondType)secondObject;

#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef FirstType
# undef SecondType
#endif
@end

OF_ASSUME_NONNULL_END

#import "OFMutablePair.h"







|
>









60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
 * @brief Initializes an already allocated OFPair with the specified objects.
 *
 * @param firstObject The first object for the pair
 * @param secondObject The second object for the pair
 * @return An initialized OFPair
 */
- (instancetype)initWithFirstObject: (nullable FirstType)firstObject
		       secondObject: (nullable SecondType)secondObject
    OF_DESIGNATED_INITIALIZER;
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef FirstType
# undef SecondType
#endif
@end

OF_ASSUME_NONNULL_END

#import "OFMutablePair.h"

Modified src/OFTriple.h from [5e36a777ce] to [90e5e31d41].

72
73
74
75
76
77
78
79

80
81
82
83
84
85
86
87
88
89
 * @param firstObject The first object for the triple
 * @param secondObject The second object for the triple
 * @param thirdObject The second object for the triple
 * @return An initialized OFTriple
 */
- (instancetype)initWithFirstObject: (nullable FirstType)firstObject
		       secondObject: (nullable SecondType)secondObject
			thirdObject: (nullable ThirdType)thirdObject;

#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef FirstType
# undef SecondType
# undef ThirdType
#endif
@end

OF_ASSUME_NONNULL_END

#import "OFMutableTriple.h"







|
>










72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
 * @param firstObject The first object for the triple
 * @param secondObject The second object for the triple
 * @param thirdObject The second object for the triple
 * @return An initialized OFTriple
 */
- (instancetype)initWithFirstObject: (nullable FirstType)firstObject
		       secondObject: (nullable SecondType)secondObject
			thirdObject: (nullable ThirdType)thirdObject
    OF_DESIGNATED_INITIALIZER;
#if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
# undef FirstType
# undef SecondType
# undef ThirdType
#endif
@end

OF_ASSUME_NONNULL_END

#import "OFMutableTriple.h"