diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /test/DHTRoutingTableSerializerTest.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'test/DHTRoutingTableSerializerTest.cc')
| -rw-r--r-- | test/DHTRoutingTableSerializerTest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/DHTRoutingTableSerializerTest.cc b/test/DHTRoutingTableSerializerTest.cc index 4a23e9d8..f4b2d480 100644 --- a/test/DHTRoutingTableSerializerTest.cc +++ b/test/DHTRoutingTableSerializerTest.cc @@ -27,7 +27,7 @@ private: char buf[20]; void checkToLocalnode - (std::istream& ss, const SharedHandle<DHTNode>& localNode); + (std::istream& ss, const std::shared_ptr<DHTNode>& localNode); void checkNumNodes(std::istream& ss, size_t expected); public: @@ -47,7 +47,7 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(DHTRoutingTableSerializerTest); void DHTRoutingTableSerializerTest::checkToLocalnode -(std::istream& ss, const SharedHandle<DHTNode>& localNode) +(std::istream& ss, const std::shared_ptr<DHTNode>& localNode) { // header ss.read(buf, 8); @@ -98,16 +98,16 @@ void DHTRoutingTableSerializerTest::checkNumNodes void DHTRoutingTableSerializerTest::testSerialize() { - SharedHandle<DHTNode> localNode(new DHTNode()); + std::shared_ptr<DHTNode> localNode(new DHTNode()); - SharedHandle<DHTNode> nodesSrc[3]; + std::shared_ptr<DHTNode> nodesSrc[3]; for(size_t i = 0; i < A2_ARRAY_LEN(nodesSrc); ++i) { nodesSrc[i].reset(new DHTNode()); nodesSrc[i]->setIPAddress("192.168.0."+util::uitos(i+1)); nodesSrc[i]->setPort(6881+i); } nodesSrc[1]->setIPAddress("non-numerical-name"); - std::vector<SharedHandle<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); + std::vector<std::shared_ptr<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); DHTRoutingTableSerializer s(AF_INET); s.setLocalNode(localNode); @@ -226,16 +226,16 @@ void DHTRoutingTableSerializerTest::testSerialize() void DHTRoutingTableSerializerTest::testSerialize6() { - SharedHandle<DHTNode> localNode(new DHTNode()); + std::shared_ptr<DHTNode> localNode(new DHTNode()); - SharedHandle<DHTNode> nodesSrc[2]; + std::shared_ptr<DHTNode> nodesSrc[2]; for(size_t i = 0; i < A2_ARRAY_LEN(nodesSrc); ++i) { nodesSrc[i].reset(new DHTNode()); nodesSrc[i]->setIPAddress("2001::100"+util::uitos(i+1)); nodesSrc[i]->setPort(6881+i); } nodesSrc[1]->setIPAddress("non-numerical-name"); - std::vector<SharedHandle<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); + std::vector<std::shared_ptr<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); DHTRoutingTableSerializer s(AF_INET6); s.setLocalNode(localNode); |