diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-22 13:47:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 13:47:55 +0100 |
commit | 384379e7f0183a8784e7d9ee21dd8ff0d7f14a4c (patch) | |
tree | aca2f06c4f0a03b46301ddf97c206bb0f6466fbc | |
parent | 9f9e7e5f9b2b9b28c3bba4bdc2f185db7dc071da (diff) | |
parent | c3ce7f72904106094c17cf2f1afbf1fa24a6faff (diff) |
Merge pull request #4239 from vespa-engine/balder/use-c++11-for-loops
Simplify by using c++11 for loops.
-rw-r--r-- | config/src/vespa/config/subscription/configsubscriptionset.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/config/src/vespa/config/subscription/configsubscriptionset.cpp b/config/src/vespa/config/subscription/configsubscriptionset.cpp index e82262d2d3c..c26d2b74fda 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.cpp +++ b/config/src/vespa/config/subscription/configsubscriptionset.cpp @@ -38,10 +38,8 @@ ConfigSubscriptionSet::acquireSnapshot(uint64_t timeoutInMillis, bool ignoreChan int64_t lastGeneration = _currentGeneration; bool inSync = false; - for (SubscriptionList::iterator it(_subscriptionList.begin()), mt(_subscriptionList.end()); - it != mt; - it++) { - (*it)->reset(); + for (const auto & subscription : _subscriptionList) { + subscription->reset(); } LOG(debug, "Going into nextConfig loop, time left is %d", timeLeft); @@ -52,10 +50,7 @@ ConfigSubscriptionSet::acquireSnapshot(uint64_t timeoutInMillis, bool ignoreChan int64_t generation = -1; // Run nextUpdate on all subscribers to get them in sync. - for (SubscriptionList::iterator it(_subscriptionList.begin()), mt(_subscriptionList.end()); - it != mt; - it++) { - ConfigSubscription::SP subscription = *it; + for (const auto & subscription : _subscriptionList) { if (!subscription->nextUpdate(_currentGeneration, timeLeft)) break; @@ -107,9 +102,9 @@ void ConfigSubscriptionSet::close() { _state = CLOSED; - for (SubscriptionList::iterator it(_subscriptionList.begin()), mt(_subscriptionList.end()); it != mt; it++) { - _mgr.unsubscribe(*it); - (*it)->close(); + for (const auto & subscription : _subscriptionList) { + _mgr.unsubscribe(subscription); + subscription->close(); } } |