From bc98e39fe5ed30c03ba3af36f46f74e10f03e635 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 11 Nov 2010 07:33:43 +0000 Subject: 2010-11-11 Tatsuhiro Tsujikawa 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 --- test/DHTGetPeersMessageTest.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/DHTGetPeersMessageTest.cc') diff --git a/test/DHTGetPeersMessageTest.cc b/test/DHTGetPeersMessageTest.cc index 11a280c1..be100ea2 100644 --- a/test/DHTGetPeersMessageTest.cc +++ b/test/DHTGetPeersMessageTest.cc @@ -124,8 +124,8 @@ void DHTGetPeersMessageTest::testDoReceivedAction() SharedHandle m (dynamic_pointer_cast (dispatcher.messageQueue_[0].message_)); - CPPUNIT_ASSERT(localNode == m->getLocalNode()); - CPPUNIT_ASSERT(remoteNode == m->getRemoteNode()); + CPPUNIT_ASSERT(*localNode == *m->getLocalNode()); + CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode()); CPPUNIT_ASSERT_EQUAL(std::string("get_peers"), m->getMessageType()); CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID()); CPPUNIT_ASSERT_EQUAL(tokenTracker.generateToken(infoHash, remoteNode->getIPAddress(), remoteNode->getPort()), m->token_); @@ -161,13 +161,13 @@ void DHTGetPeersMessageTest::testDoReceivedAction() SharedHandle m (dynamic_pointer_cast (dispatcher.messageQueue_[0].message_)); - CPPUNIT_ASSERT(localNode == m->getLocalNode()); - CPPUNIT_ASSERT(remoteNode == m->getRemoteNode()); + CPPUNIT_ASSERT(*localNode == *m->getLocalNode()); + CPPUNIT_ASSERT(*remoteNode == *m->getRemoteNode()); CPPUNIT_ASSERT_EQUAL(std::string("get_peers"), m->getMessageType()); CPPUNIT_ASSERT_EQUAL(msg.getTransactionID(), m->getTransactionID()); CPPUNIT_ASSERT_EQUAL(tokenTracker.generateToken(infoHash, remoteNode->getIPAddress(), remoteNode->getPort()), m->token_); CPPUNIT_ASSERT_EQUAL((size_t)1, m->nodes_.size()); - CPPUNIT_ASSERT(returnNode1 == m->nodes_[0]); + CPPUNIT_ASSERT(*returnNode1 == *m->nodes_[0]); CPPUNIT_ASSERT_EQUAL((size_t)0, m->peers_.size()); } } -- cgit