Overview
| Comment: | Fix compiling as ObjC++ |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
487aa4d51b74a329a2e21cdb26d80d8b |
| User & Date: | js on 2017-11-19 14:41:52 |
| Other Links: | manifest | tags |
Context
|
2017-11-19
| ||
| 19:44 | OFMutableURL: Fix setting to nil check-in: a1299b581b user: js tags: trunk | |
| 14:41 | Fix compiling as ObjC++ check-in: 487aa4d51b user: js tags: trunk | |
| 13:14 | Remove +[OFObject new] check-in: c03aab9c8c user: js tags: trunk | |
Changes
Modified src/OFObject.h from [c6967b6935] to [5636413cd6].
| ︙ | ︙ | |||
197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | * * @brief The protocol which all root classes implement. */ @protocol OFObject /*! * @brief The class of the object. */ @property (readonly, nonatomic) Class class; /*! * @brief The superclass of the object. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) Class superclass; /*! | > > > > | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | * * @brief The protocol which all root classes implement. */ @protocol OFObject /*! * @brief The class of the object. */ #ifndef __cplusplus @property (readonly, nonatomic) Class class; #else @property (readonly, nonatomic, getter=class) Class class_; #endif /*! * @brief The superclass of the object. */ @property OF_NULLABLE_PROPERTY (readonly, nonatomic) Class superclass; /*! |
| ︙ | ︙ | |||
413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | Class _isa; #else Class _isa __attribute__((__unused__)); #endif } #ifdef OF_HAVE_CLASS_PROPERTIES @property (class, readonly, nonatomic) Class class; @property (class, readonly, nonatomic) OFString *className; @property (class, readonly, nullable, nonatomic) Class superclass; @property (class, readonly, nonatomic) OFString *description; #endif /*! * @brief The name of the object's class. | > > > > | 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 | Class _isa; #else Class _isa __attribute__((__unused__)); #endif } #ifdef OF_HAVE_CLASS_PROPERTIES # ifndef __cplusplus @property (class, readonly, nonatomic) Class class; # else @property (class, readonly, nonatomic, getter=class) Class class_; # endif @property (class, readonly, nonatomic) OFString *className; @property (class, readonly, nullable, nonatomic) Class superclass; @property (class, readonly, nonatomic) OFString *description; #endif /*! * @brief The name of the object's class. |
| ︙ | ︙ |