From f1ae9a34b8fa826f53372d052366019fb60c83f3 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 3 Feb 2015 21:01:03 +0000 Subject: TemporaryIceAdapterObject should take and keep a handle to its object --- p2pvr/lib/temporaryIceAdapterObject.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/p2pvr/lib/temporaryIceAdapterObject.h b/p2pvr/lib/temporaryIceAdapterObject.h index 411f7cf..d7fc77d 100644 --- a/p2pvr/lib/temporaryIceAdapterObject.h +++ b/p2pvr/lib/temporaryIceAdapterObject.h @@ -6,7 +6,7 @@ template class TemporaryIceAdapterObject { public: - TemporaryIceAdapterObject(Ice::ObjectAdapterPtr a, Object * o) : + TemporaryIceAdapterObject(Ice::ObjectAdapterPtr a, IceUtil::Handle o) : adapter(a), object(o), proxy(Object::ProxyType::checkedCast(adapter->addWithUUID(object))) @@ -31,7 +31,7 @@ class TemporaryIceAdapterObject { Object * Get() const { - return object; + return object.get(); } typename Object::ProxyType operator->() const @@ -54,7 +54,7 @@ class TemporaryIceAdapterObject { private: Ice::ObjectAdapterPtr adapter; - Object * object; + IceUtil::Handle object; typename Object::ProxyType proxy; }; -- cgit v1.2.3