| Comment: | Add OF_NULLABLE_PROPERTY
This is necessary to make GCC (>= 4.6 and Apple GCC) happy as they don't |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
80e1a9655beab3177781fb00694e45a0 |
| User & Date: | js on 2015-06-17 22:11:31 |
| Other Links: | manifest | tags |
|
2015-06-17
| ||
| 22:19 | utils/ofhttp: Make old Apple GCC happy (check-in: a3f24bdd18 user: js tags: trunk) | |
| 22:11 | Add OF_NULLABLE_PROPERTY (check-in: 80e1a9655b user: js tags: trunk) | |
|
2015-06-14
| ||
| 13:10 | OFDate: Improve handling of distant past / future (check-in: 168b748eb8 user: js tags: trunk) | |
Modified src/OFApplication.h from [e950676ac5] to [ed8ed6f607].
| ︙ | |||
131 132 133 134 135 136 137 | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | - + |
}
#ifdef OF_HAVE_PROPERTIES
@property (readonly, copy, nonatomic) OFString *programName;
@property (readonly, copy, nonatomic) OFArray OF_GENERIC(OFString*) *arguments;
@property (readonly, copy, nonatomic)
OFDictionary OF_GENERIC(OFString*, OFString*) *environment;
|
| ︙ |
Modified src/OFHTTPClient.h from [74c3496cfd] to [1d478e9a98].
| ︙ | |||
106 107 108 109 110 111 112 | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | - + | OFTCPSocket *_socket; OFURL *_lastURL; bool _lastWasHEAD; OFHTTPResponse *_lastResponse; } #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/OFHTTPRequest.h from [a0120e2911] to [2b094f8687].
| ︙ | |||
80 81 82 83 84 85 86 | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | + - + - - - + + | OFString *_remoteAddress; } #ifdef OF_HAVE_PROPERTIES @property (copy) OFURL *URL; @property of_http_request_method_t method; @property of_http_request_protocol_version_t protocolVersion; @property OF_NULLABLE_PROPERTY (copy) |
| ︙ |
Modified src/OFHTTPResponse.h from [043802ccf0] to [127c6d8f9d].
| ︙ | |||
32 33 34 35 36 37 38 | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | + - + - | short _statusCode; OFDictionary OF_GENERIC(OFString*, OFString*) *_headers; } #ifdef OF_HAVE_PROPERTIES @property of_http_request_protocol_version_t protocolVersion; @property short statusCode; @property OF_NULLABLE_PROPERTY (copy) |
| ︙ |
Modified src/OFHTTPServer.h from [a9420ff4db] to [0b4b52c4cd].
| ︙ | |||
75 76 77 78 79 80 81 | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 | - + - - + + | uint16_t _port; id <OFHTTPServerDelegate> _delegate; OFString *_name; OFTCPSocket *_listeningSocket; } #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/OFIntrospection.h from [0bd232c6bc] to [061b43fb0e].
| ︙ | |||
48 49 50 51 52 53 54 | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | - + | OFString *_name; const char *_typeEncoding; } #ifdef OF_HAVE_PROPERTIES @property (readonly) SEL selector; @property (readonly, copy) OFString *name; |
| ︙ | |||
88 89 90 91 92 93 94 | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | - + | unsigned _attributes; OFString *_getter, *_setter; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *name; @property (readonly) unsigned attributes; |
| ︙ | |||
149 150 151 152 153 154 155 | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | - + | const char *_typeEncoding; ptrdiff_t _offset; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *name; @property (readonly) ptrdiff_t offset; |
| ︙ |
Modified src/OFKernelEventObserver.h from [134a6fc2ce] to [dd8f6e2345].
| ︙ | |||
125 126 127 128 129 130 131 | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | + - + | #endif #ifdef OF_HAVE_THREADS OFMutex *_mutex; #endif } #ifdef OF_HAVE_PROPERTIES @property OF_NULLABLE_PROPERTY (assign) |
| ︙ |
Modified src/OFList.h from [5074e7258e] to [2c4a93e677].
| ︙ | |||
57 58 59 60 61 62 63 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | - - + + | of_list_object_t *_firstListObject; of_list_object_t *_lastListObject; size_t _count; unsigned long _mutations; } #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/OFLocking.h from [aabddd2a24] to [5d56441827].
| ︙ | |||
21 22 23 24 25 26 27 | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | - + | /*! * @protocol OFLocking OFLocking.h ObjFW/OFLocking.h * * @brief A protocol for locks. */ @protocol OFLocking <OFObject> #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/OFTCPSocket.h from [5654a78b4e] to [6382beb2ce].
| ︙ | |||
65 66 67 68 69 70 71 | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | - + | socklen_t _addressLength; OFString *_SOCKS5Host; uint16_t _SOCKS5Port; } #ifdef OF_HAVE_PROPERTIES @property (readonly, getter=isListening) bool listening; |
| ︙ |
Modified src/OFTLSSocket.h from [968eca3d6d] to [d1223f2527].
| ︙ | |||
53 54 55 56 57 58 59 | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | - - - + + + + | * @protocol OFTLSSocket OFTLSSocket.h ObjFW/OFTLSSocket.h * * @brief A protocol that should be implemented by 3rd-party libraries * implementing TLS. */ @protocol OFTLSSocket #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/OFURL.h from [a3a984e369] to [f7f23cc369].
| ︙ | |||
30 31 32 33 34 35 36 | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | - + - - + - - + - - |
{
OFString *_scheme, *_host;
uint16_t _port;
OFString *_user, *_password, *_path, *_parameters, *_query, *_fragment;
}
#ifdef OF_HAVE_PROPERTIES
|
| ︙ |
Modified src/OFXMLAttribute.h from [06dd68e3e3] to [bddff10d67].
| ︙ | |||
30 31 32 33 34 35 36 | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | - + + - + | @public OFString *_name, *_namespace, *_stringValue; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *name; # ifdef __cplusplus |
| ︙ |
Modified src/OFXMLElement.h from [06c926080e] to [f0a48e322d].
| ︙ | |||
39 40 41 42 43 44 45 | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | - + - + - - - - + + + + | OFMutableDictionary OF_GENERIC(OFString*, OFString*) *_namespaces; OFMutableArray OF_GENERIC(OFXMLNode*) *_children; } #ifdef OF_HAVE_PROPERTIES @property (copy) OFString *name; # ifdef __cplusplus |
| ︙ |
Modified src/OFXMLElementBuilder.h from [0cd8345c79] to [4ca47d4bb3].
| ︙ | |||
109 110 111 112 113 114 115 | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 | + - + |
@interface OFXMLElementBuilder: OFObject <OFXMLParserDelegate>
{
OFMutableArray OF_GENERIC(OFXMLElement*) *_stack;
id <OFXMLElementBuilderDelegate> _delegate;
}
#ifdef OF_HAVE_PROPERTIES
@property OF_NULLABLE_PROPERTY (assign)
|
| ︙ |
Modified src/OFXMLParser.h from [67de382a36] to [8ab695520f].
| ︙ | |||
174 175 176 177 178 179 180 | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | - + | size_t _lineNumber; bool _lastCarriageReturn, _finishedParsing; of_string_encoding_t _encoding; size_t _depthLimit; } #ifdef OF_HAVE_PROPERTIES |
| ︙ |
Modified src/macros.h from [6f2726fb11] to [67aef400e2].
| ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | + + |
#endif
#if __has_feature(nullability)
# define OF_ASSUME_NONNULL_BEGIN _Pragma("clang assume_nonnull begin")
# define OF_ASSUME_NONNULL_END _Pragma("clang assume_nonnull end")
# define OF_NONNULL __nonnull
# define OF_NULLABLE __nullable
# define OF_NULLABLE_PROPERTY(...) (__VA_ARGS__, nullable)
#else
# define OF_ASSUME_NONNULL_BEGIN
# define OF_ASSUME_NONNULL_END
# define OF_NONNULL
# define OF_NULLABLE
# define OF_NULLABLE_PROPERTY
# define nonnull
# define nullable
#endif
#if __has_feature(objc_kindof)
# define OF_KINDOF(cls) __kindof cls
#else
|
| ︙ |