diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-20 00:50:22 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-20 00:50:22 +0000 |
| commit | 3505201f3333c937b5b870d70019d400c722a69f (patch) | |
| tree | def64ac6be50375e43da5e3e91eb443dd4c171fc /src/DHTAbstractNodeLookupTask.cc | |
| parent | 99733a84e2102739ee7c9de08ffae9e9216b6003 (diff) | |
2008-04-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Rewritten SharedHandle. Now copy constructor taking raw pointer
has
keyword explicit and SharedHandle's default constructor
initializes
its internal obj to null, old implementation initializes it
using
obj's default constructor.
To assign null, write SharedHandle<T> x(...); x.reset();
TODO: test/SharedHandleTest.cc needs more tests.
* src/SharedHandle.h
Diffstat (limited to 'src/DHTAbstractNodeLookupTask.cc')
| -rw-r--r-- | src/DHTAbstractNodeLookupTask.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/DHTAbstractNodeLookupTask.cc b/src/DHTAbstractNodeLookupTask.cc index 598c68a4..8b372aca 100644 --- a/src/DHTAbstractNodeLookupTask.cc +++ b/src/DHTAbstractNodeLookupTask.cc @@ -118,7 +118,9 @@ void DHTAbstractNodeLookupTask::sendMessage() ++_inFlightMessage; (*i)->_used = true; SharedHandle<DHTMessage> m = createMessage((*i)->_node); - _dispatcher->addMessageToQueue(m, new DHTMessageCallbackImpl(this)); + WeakHandle<DHTMessageCallbackListener> listener(this); + SharedHandle<DHTMessageCallback> callback(new DHTMessageCallbackImpl(listener)); + _dispatcher->addMessageToQueue(m, callback); } } } @@ -149,7 +151,7 @@ DHTAbstractNodeLookupTask::toEntries(const std::deque<SharedHandle<DHTNode> >& n { std::deque<SharedHandle<DHTNodeLookupEntry> > entries; for(std::deque<SharedHandle<DHTNode> >::const_iterator i = nodes.begin(); i != nodes.end(); ++i) { - SharedHandle<DHTNodeLookupEntry> e = new DHTNodeLookupEntry(*i); + SharedHandle<DHTNodeLookupEntry> e(new DHTNodeLookupEntry(*i)); entries.push_back(e); } return entries; |