Differences From Artifact [cad56e81b9]:
- File src/OFKernelEventObserver.h — part of check-in [cc3ad3ddd3] at 2017-11-18 18:50:50 on branch trunk — Documentation: Use @brief for all properties (user: js, size: 6366) [annotate] [blame] [check-ins using]
To Artifact [ee35836078]:
- File
src/OFKernelEventObserver.h
— part of check-in
[69749b6a5b]
at
2017-11-19 11:04:22
on branch trunk
— Do not conform to OFReadyFor*Observing by default
Instead of letting OFStream conform to it, which itself does not really
conform to it, let all the subclasses that actually do conform to it. (user: js, size: 6427) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
12 13 14 15 16 17 18 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" | > | > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" #ifdef OF_HAVE_SOCKETS # import "socket.h" #endif OF_ASSUME_NONNULL_BEGIN @class OFMutableArray OF_GENERIC(ObjectType); @class OFDate; #ifdef OF_HAVE_THREADS @class OFMutex; |
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | /*! * @brief The file descriptor for writing that should be checked by the * OFKernelEventObserver. */ @property (readonly, nonatomic) int fileDescriptorForWriting; @end /*! * @class OFKernelEventObserver * OFKernelEventObserver.h ObjFW/OFKernelEventObserver.h * * @brief A class that can observe multiple kernel events (e.g. streams being * ready to read) at once. * | > | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | /*! * @brief The file descriptor for writing that should be checked by the * OFKernelEventObserver. */ @property (readonly, nonatomic) int fileDescriptorForWriting; @end #ifdef OF_HAVE_SOCKETS /*! * @class OFKernelEventObserver * OFKernelEventObserver.h ObjFW/OFKernelEventObserver.h * * @brief A class that can observe multiple kernel events (e.g. streams being * ready to read) at once. * |
︙ | ︙ | |||
201 202 203 204 205 206 207 208 209 | * * This is automatically done when a new object is added or removed by another * thread, but in some circumstances, it might be desirable for a thread to * manually stop the observe running in another thread. */ - (void)cancel; @end OF_ASSUME_NONNULL_END | > | 204 205 206 207 208 209 210 211 212 213 | * * This is automatically done when a new object is added or removed by another * thread, but in some circumstances, it might be desirable for a thread to * manually stop the observe running in another thread. */ - (void)cancel; @end #endif OF_ASSUME_NONNULL_END |