diff options
| author | Nils Maier <maierman@web.de> | 2013-08-21 05:06:53 +0200 |
|---|---|---|
| committer | Nils Maier <maierman@web.de> | 2013-08-21 05:56:17 +0200 |
| commit | 8526ceeb452d23d7aa73d01c6cb0fc8ae5e0377b (patch) | |
| tree | 825b4f5d2a0f18331fbbf24773e80ee0b44b50dc /src/DHTBucket.cc | |
| parent | d8f44ef4f6c5ad86b08658ecba41a84b775b6e69 (diff) | |
Convert to autos and ranged loops
Diffstat (limited to 'src/DHTBucket.cc')
| -rw-r--r-- | src/DHTBucket.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index 7bebf4c7..feab6c57 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -110,7 +110,7 @@ bool DHTBucket::isInRange(const unsigned char* nodeID, bool DHTBucket::addNode(const std::shared_ptr<DHTNode>& node) { notifyUpdate(); - std::deque<std::shared_ptr<DHTNode> >::iterator itr = + auto itr = std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr == nodes_.end()) { if(nodes_.size() < K) { @@ -144,7 +144,7 @@ void DHTBucket::cacheNode(const std::shared_ptr<DHTNode>& node) void DHTBucket::dropNode(const std::shared_ptr<DHTNode>& node) { if(!cachedNodes_.empty()) { - std::deque<std::shared_ptr<DHTNode> >::iterator itr = + auto itr = std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr != nodes_.end()) { nodes_.erase(itr); @@ -156,7 +156,7 @@ void DHTBucket::dropNode(const std::shared_ptr<DHTNode>& node) void DHTBucket::moveToHead(const std::shared_ptr<DHTNode>& node) { - std::deque<std::shared_ptr<DHTNode> >::iterator itr = + auto itr = std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr != nodes_.end()) { nodes_.erase(itr); @@ -166,7 +166,7 @@ void DHTBucket::moveToHead(const std::shared_ptr<DHTNode>& node) void DHTBucket::moveToTail(const std::shared_ptr<DHTNode>& node) { - std::deque<std::shared_ptr<DHTNode> >::iterator itr = + auto itr = std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr != nodes_.end()) { nodes_.erase(itr); @@ -196,12 +196,11 @@ std::shared_ptr<DHTBucket> DHTBucket::split() rMax, rMin, localNode_)); std::deque<std::shared_ptr<DHTNode> > lNodes; - for(std::deque<std::shared_ptr<DHTNode> >::iterator i = nodes_.begin(), - eoi = nodes_.end(); i != eoi; ++i) { - if(rBucket->isInRange(*i)) { - assert(rBucket->addNode(*i)); + for(auto & elem : nodes_) { + if(rBucket->isInRange(elem)) { + assert(rBucket->addNode(elem)); } else { - lNodes.push_back(*i); + lNodes.push_back(elem); } } nodes_ = lNodes; @@ -231,7 +230,7 @@ std::shared_ptr<DHTNode> DHTBucket::getNode(const unsigned char* nodeID, const s std::shared_ptr<DHTNode> node(new DHTNode(nodeID)); node->setIPAddress(ipaddr); node->setPort(port); - std::deque<std::shared_ptr<DHTNode> >::const_iterator itr = + auto itr = std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr == nodes_.end() || (*itr)->getIPAddress() != ipaddr || (*itr)->getPort() != port) { @@ -275,7 +274,7 @@ bool DHTBucket::containsQuestionableNode() const std::shared_ptr<DHTNode> DHTBucket::getLRUQuestionableNode() const { - std::deque<std::shared_ptr<DHTNode> >::const_iterator i = + auto i = std::find_if(nodes_.begin(), nodes_.end(), FindQuestionableNode()); if(i == nodes_.end()) { return nullptr; |