ObjFW  Check-in [5116342c0a]

Overview
Comment:Add OF_SUBCLASSING_RESTRICTED
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5116342c0ac47e67c58ec98a796469058ceb71f2d1022f303190dd850f89bdf6
User & Date: js on 2015-06-28 16:28:32
Other Links: manifest | tags
Context
2015-06-28
16:39
tests: Use __VA_ARGS__ for TEST() and clean up check-in: 07e630588d user: js tags: trunk
16:28
Add OF_SUBCLASSING_RESTRICTED check-in: 5116342c0a user: js tags: trunk
16:16
Extremely minor API inconsistency fix check-in: 1b1db13483 user: js tags: trunk
Changes

Modified src/OFNull.h from [69a8b20533] to [347186bcf6].

22
23
24
25
26
27
28

29
30
31
32
33
34
35
36
37
38
39
OF_ASSUME_NONNULL_BEGIN

/*!
 * @class OFNull OFNull.h ObjFW/OFNull.h
 *
 * @brief A class for representing null values in collections.
 */

@interface OFNull: OFObject <OFCopying, OFSerialization, OFJSONRepresentation,
    OFMessagePackRepresentation>
/*!
 * @brief Returns an OFNull singleton.
 *
 * @return An OFNull singleton
 */
+ (OFNull*)null;
@end

OF_ASSUME_NONNULL_END







>











22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
OF_ASSUME_NONNULL_BEGIN

/*!
 * @class OFNull OFNull.h ObjFW/OFNull.h
 *
 * @brief A class for representing null values in collections.
 */
OF_SUBCLASSING_RESTRICTED
@interface OFNull: OFObject <OFCopying, OFSerialization, OFJSONRepresentation,
    OFMessagePackRepresentation>
/*!
 * @brief Returns an OFNull singleton.
 *
 * @return An OFNull singleton
 */
+ (OFNull*)null;
@end

OF_ASSUME_NONNULL_END

Modified src/OFStdIOStream.h from [75654b8c7a] to [d6e15b6412].

22
23
24
25
26
27
28

29
30
31
32
33
34
35
 * @class OFStdIOStream OFStdIOStream.h ObjFW/OFStdIOStream.h
 *
 * @brief A class for providing standard input, output and error as OFStream.
 *
 * The global variables @ref of_stdin, @ref of_stdout and @ref of_stderr are
 * instances of this class and need no initialization.
 */

@interface OFStdIOStream: OFStream
{
	int  _fd;
	bool _atEndOfStream;
}
@end








>







22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 * @class OFStdIOStream OFStdIOStream.h ObjFW/OFStdIOStream.h
 *
 * @brief A class for providing standard input, output and error as OFStream.
 *
 * The global variables @ref of_stdin, @ref of_stdout and @ref of_stderr are
 * instances of this class and need no initialization.
 */
OF_SUBCLASSING_RESTRICTED
@interface OFStdIOStream: OFStream
{
	int  _fd;
	bool _atEndOfStream;
}
@end

Modified src/macros.h from [67aef400e2] to [1619f8ecc0].

217
218
219
220
221
222
223







224
225
226
227
228
229
230
#endif

#if __has_attribute(__objc_root_class__)
# define OF_ROOT_CLASS __attribute__((__objc_root_class__))
#else
# define OF_ROOT_CLASS
#endif








#ifdef __GNUC__
# if defined(__x86_64__) || defined(__amd64__)
#  define OF_X86_64_ASM
# elif defined(__i386__)
#  define OF_X86_ASM
# elif defined(__ppc__) || defined(__PPC__)







>
>
>
>
>
>
>







217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
#endif

#if __has_attribute(__objc_root_class__)
# define OF_ROOT_CLASS __attribute__((__objc_root_class__))
#else
# define OF_ROOT_CLASS
#endif

#if __has_attribute(__objc_subclassing_restricted__)
# define OF_SUBCLASSING_RESTRICTED \
	__attribute__((__objc_subclassing_restricted__))
#else
# define OF_SUBCLASSING_RESTRICTED
#endif

#ifdef __GNUC__
# if defined(__x86_64__) || defined(__amd64__)
#  define OF_X86_64_ASM
# elif defined(__i386__)
#  define OF_X86_ASM
# elif defined(__ppc__) || defined(__PPC__)