diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-24 21:46:42 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-24 21:46:42 +0900 |
| commit | 10cdc59297f4e1327217008f2ae073c400959df2 (patch) | |
| tree | 2f586b0842aba8162e37497e25a1ddd6ceb156e6 /test/DHTRoutingTableSerializerTest.cc | |
| parent | d2ec57057e591810ebbb5febb34ae0cadf5068c5 (diff) | |
Remove vbegin and vend in favor of std::begin and std::end
Diffstat (limited to 'test/DHTRoutingTableSerializerTest.cc')
| -rw-r--r-- | test/DHTRoutingTableSerializerTest.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/test/DHTRoutingTableSerializerTest.cc b/test/DHTRoutingTableSerializerTest.cc index f4b2d480..22d30093 100644 --- a/test/DHTRoutingTableSerializerTest.cc +++ b/test/DHTRoutingTableSerializerTest.cc @@ -100,14 +100,13 @@ void DHTRoutingTableSerializerTest::testSerialize() { std::shared_ptr<DHTNode> localNode(new DHTNode()); - 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); + std::vector<std::shared_ptr<DHTNode>> nodes(3); + for(size_t i = 0; i < nodes.size(); ++i) { + nodes[i].reset(new DHTNode()); + nodes[i]->setIPAddress("192.168.0."+util::uitos(i+1)); + nodes[i]->setPort(6881+i); } - nodesSrc[1]->setIPAddress("non-numerical-name"); - std::vector<std::shared_ptr<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); + nodes[1]->setIPAddress("non-numerical-name"); DHTRoutingTableSerializer s(AF_INET); s.setLocalNode(localNode); @@ -228,14 +227,13 @@ void DHTRoutingTableSerializerTest::testSerialize6() { std::shared_ptr<DHTNode> localNode(new DHTNode()); - 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); + std::vector<std::shared_ptr<DHTNode>> nodes(2); + for(size_t i = 0; i < nodes.size(); ++i) { + nodes[i].reset(new DHTNode()); + nodes[i]->setIPAddress("2001::100"+util::uitos(i+1)); + nodes[i]->setPort(6881+i); } - nodesSrc[1]->setIPAddress("non-numerical-name"); - std::vector<std::shared_ptr<DHTNode> > nodes(vbegin(nodesSrc), vend(nodesSrc)); + nodes[1]->setIPAddress("non-numerical-name"); DHTRoutingTableSerializer s(AF_INET6); s.setLocalNode(localNode); |