summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Selector.h
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-01-13 09:39:17 +0100
committerJose <jose@zeroc.com>2017-01-13 09:39:17 +0100
commitfd6e9a9f4607d8bbec226deebbd99e036c1873d9 (patch)
tree0f9aab46d22a22dddc1338cd2d8a6f4eca0f5b0b /cpp/src/Ice/Selector.h
parentAdded shutdown of the simulator (diff)
downloadice-fd6e9a9f4607d8bbec226deebbd99e036c1873d9.tar.bz2
ice-fd6e9a9f4607d8bbec226deebbd99e036c1873d9.tar.xz
ice-fd6e9a9f4607d8bbec226deebbd99e036c1873d9.zip
Fixed (ICE-7480) - Use UniqueRef to manage CoreFoundation types.
Diffstat (limited to 'cpp/src/Ice/Selector.h')
-rw-r--r--cpp/src/Ice/Selector.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index 7434a240763..95f8ed432de 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -17,6 +17,7 @@
#include <Ice/Network.h>
#include <Ice/InstanceF.h>
#include <Ice/EventHandlerF.h>
+#include <Ice/UniqueRef.h>
#if defined(ICE_USE_EPOLL)
# include <sys/epoll.h>
@@ -255,8 +256,8 @@ private:
Selector& _selector;
SocketOperation _ready;
bool _finish;
- CFSocketRef _socket;
- CFRunLoopSourceRef _source;
+ IceInternal::UniqueRef<CFSocketRef> _socket;
+ IceInternal::UniqueRef<CFRunLoopSourceRef> _source;
};
typedef IceUtil::Handle<EventHandlerWrapper> EventHandlerWrapperPtr;
@@ -295,7 +296,7 @@ private:
InstancePtr _instance;
IceUtil::ThreadPtr _thread;
CFRunLoopRef _runLoop;
- CFRunLoopSourceRef _source;
+ IceInternal::UniqueRef<CFRunLoopSourceRef> _source;
bool _destroyed;
std::set<EventHandlerWrapperPtr> _changes;