diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-02-03 21:01:03 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-06-13 17:29:50 +0100 |
| commit | f1ae9a34b8fa826f53372d052366019fb60c83f3 (patch) | |
| tree | 39c00e7c2d627f21cc4e7de68481ad0be24f67ab | |
| parent | Extend mock tuner to support basic streaming with sample of BBC One (diff) | |
| download | p2pvr-f1ae9a34b8fa826f53372d052366019fb60c83f3.tar.bz2 p2pvr-f1ae9a34b8fa826f53372d052366019fb60c83f3.tar.xz p2pvr-f1ae9a34b8fa826f53372d052366019fb60c83f3.zip | |
TemporaryIceAdapterObject should take and keep a handle to its object
| -rw-r--r-- | p2pvr/lib/temporaryIceAdapterObject.h | 6 |
1 files 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 <typename Object> class TemporaryIceAdapterObject { public: - TemporaryIceAdapterObject(Ice::ObjectAdapterPtr a, Object * o) : + TemporaryIceAdapterObject(Ice::ObjectAdapterPtr a, IceUtil::Handle<Object> 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> object; typename Object::ProxyType proxy; }; |