diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-11 07:33:43 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-11 07:33:43 +0000 |
| commit | bc98e39fe5ed30c03ba3af36f46f74e10f03e635 (patch) | |
| tree | 15b13a4dd63c0f5a3892c80aba7d0a4d72da65f4 /src/DHTAbstractNodeLookupTask.h | |
| parent | bcf4593bda20504f026e359413f226519cbb8d37 (diff) | |
2010-11-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
To match the behavior of friend operator functions in
SharedHandle.h to std::tr1::shared_ptr, we intentionally broke
these functions and modified code so that our code does not depend
on old behavior.
* src/AbstractCommand.cc
* src/DHTAbstractNodeLookupTask.h
* src/DHTBucket.cc
* src/DHTMessageReceiver.cc
* src/DHTNodeLookupEntry.cc
* src/DHTRoutingTable.cc
* src/DefaultBtRequestFactory.cc
* src/DefaultPeerStorage.cc
* src/DefaultPieceStorage.cc
* src/DownloadContext.cc
* src/EpollEventPoll.cc
* src/Event.h
* src/HttpConnection.cc
* src/KqueueEventPoll.cc
* src/MultiDiskAdaptor.cc
* src/PeerAbstractCommand.cc
* src/PieceStatMan.cc
* src/PollEventPoll.cc
* src/PortEventPoll.cc
* src/SegmentMan.cc
* src/SelectEventPoll.cc
* src/SelectEventPoll.h
* src/ServerStatMan.cc
* src/SharedHandle.h
* src/UnknownLengthPieceStorage.cc
* src/a2functional.h
* src/option_processing.cc
* src/version_usage.cc
* test/BNodeTest.cc
* test/DHTAnnouncePeerMessageTest.cc
* test/DHTBucketTest.cc
* test/DHTFindNodeMessageTest.cc
* test/DHTGetPeersMessageTest.cc
* test/DHTIDCloserTest.cc
* test/DHTMessageFactoryImplTest.cc
* test/DHTPingMessageTest.cc
* test/DefaultBtRequestFactoryTest.cc
* test/DefaultPeerStorageTest.cc
* test/SequentialPickerTest.cc
* test/SingletonHolderTest.cc
Diffstat (limited to 'src/DHTAbstractNodeLookupTask.h')
| -rw-r--r-- | src/DHTAbstractNodeLookupTask.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/DHTAbstractNodeLookupTask.h b/src/DHTAbstractNodeLookupTask.h index 869e0597..0922d8fa 100644 --- a/src/DHTAbstractNodeLookupTask.h +++ b/src/DHTAbstractNodeLookupTask.h @@ -54,6 +54,7 @@ #include "Logger.h" #include "util.h" #include "DHTIDCloser.h" +#include "a2functional.h" namespace aria2 { @@ -203,7 +204,10 @@ public: static_cast<unsigned long>(count)); } std::stable_sort(entries_.begin(), entries_.end(), DHTIDCloser(targetID_)); - entries_.erase(std::unique(entries_.begin(), entries_.end()), entries_.end()); + entries_.erase + (std::unique(entries_.begin(), entries_.end(), + DerefEqualTo<SharedHandle<DHTNodeLookupEntry> >()), + entries_.end()); if(getLogger()->debug()) { getLogger()->debug("%lu node lookup entries are unique.", static_cast<unsigned long>(entries_.size())); @@ -223,7 +227,7 @@ public: --inFlightMessage_; for(std::deque<SharedHandle<DHTNodeLookupEntry> >::iterator i = entries_.begin(), eoi = entries_.end(); i != eoi; ++i) { - if((*i)->node == node) { + if(*(*i)->node == *node) { entries_.erase(i); break; } |