C++11 for loops.

9 files changed, 39 insertions, 60 deletions

diff --git a/metrics/src/tests/loadmetrictest.cpp b/metrics/src/tests/loadmetrictest.cpp
index d14595b3044..8ea3e9aee6d 100644
--- a/metrics/src/tests/loadmetrictest.cpp
+++ b/metrics/src/tests/loadmetrictest.cpp
@@ -59,8 +59,7 @@ namespace {
         MyMetricSet(MetricSet* owner = 0)
             : MetricSet("tick", "", "", owner),
               metric("tack", "", "", this)
-        {
-        }
+        { }
 
         MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
                          MetricSet* owner, bool includeUnused = false) const override
@@ -70,6 +69,8 @@ namespace {
             }
             MyMetricSet * myset = new MyMetricSet(owner);
             myset->assignValues(*this);
+            std::cerr << "org:" << this->toString(true) << std::endl;
+            std::cerr << "clone:" << myset->toString(true) << std::endl;
             return myset;
         }
     };
@@ -101,6 +102,7 @@ LoadMetricTest::testClone(Metric::CopyType copyType)
         "    bar:\n"
         "      tack average=0 last=0 count=0 total=0";
 
+    CPPUNIT_ASSERT_EQUAL(expected, std::string(top.toString(true)));
     CPPUNIT_ASSERT_EQUAL(expected, std::string(copy->toString(true)));
 }
 
diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp
index f164bf03ee1..d0441e1b3e1 100644
--- a/metrics/src/tests/stresstest.cpp
+++ b/metrics/src/tests/stresstest.cpp
@@ -44,11 +44,10 @@ namespace {
         }
 
         MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
-                      MetricSet* owner, bool includeUnused) const
+                      MetricSet* owner, bool includeUnused) const override
         {
             if (copyType != CLONE) {
-                return MetricSet::clone(ownerList, copyType, owner,
-                                        includeUnused);
+                return MetricSet::clone(ownerList, copyType, owner, includeUnused);
             }
             InnerMetricSet * myset = new InnerMetricSet(getName().c_str(), _loadTypes, owner);
             myset->assignValues(*this);
diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp
index ea456ece92c..ae743e959d1 100644
--- a/metrics/src/vespa/metrics/loadmetric.hpp
+++ b/metrics/src/vespa/metrics/loadmetric.hpp
@@ -40,7 +40,7 @@ LoadMetric<MetricType>::LoadMetric(const LoadMetric<MetricType>& other, MetricSe
     _metrics.resize(2 * other._metrics.size());
     setTags(other.getTags());
     Tags noTags;
-    for (const auto & metric : _metrics) {
+    for (const auto & metric : other._metrics) {
         MetricTypeLP copy(dynamic_cast<MetricType*>(metric.second->clone(_ownerList, CLONE, 0, false)));
         assert(copy.get());
         copy->setName(metric.second->getName());
@@ -58,8 +58,8 @@ LoadMetric<MetricType>::~LoadMetric() { }
 template<typename MetricType>
 MetricSet*
 LoadMetric<MetricType>::clone(std::vector<Metric::LP>& ownerList,
-                      CopyType copyType, MetricSet* owner,
-                      bool includeUnused) const
+                              CopyType copyType, MetricSet* owner,
+                              bool includeUnused) const
 {
     if (copyType == INACTIVE) {
         return MetricSet::clone(ownerList, INACTIVE, owner, includeUnused);
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 7e56087887a..1f08e61f8d6 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -28,10 +28,8 @@ MetricManager::ConsumerSpec::print(std::ostream& out, bool verbose,
     (void) verbose;
     out << "ConsumerSpec(";
     std::set<Metric::String> sortedMetrics;
-    for (vespalib::hash_set<Metric::String>::const_iterator it
-            = includedMetrics.begin(); it != includedMetrics.end(); ++it)
-    {
-        sortedMetrics.insert(*it);
+    for (const Metric::String & name : includedMetrics) {
+        sortedMetrics.insert(name);
     }
     for (auto s : sortedMetrics) {
         out << "\n" << indent << "  " << s;
@@ -43,12 +41,8 @@ void
 MetricManager::ConsumerSpec::addMemoryUsage(MemoryConsumption& mc) const
 {
     mc._consumerMetricsInTotal += includedMetrics.size();
-    for (vespalib::hash_set<Metric::String>::const_iterator it
-            = includedMetrics.begin(); it != includedMetrics.end(); ++it)
-    {
-        mc._consumerMetricIds += mc.getStringMemoryUsage(
-                                    *it, mc._consumerMetricIdsUnique)
-                               + sizeof(Metric::String);
+    for (const Metric::String & name : includedMetrics) {
+        mc._consumerMetricIds += mc.getStringMemoryUsage(name, mc._consumerMetricIdsUnique) + sizeof(Metric::String);
     }
 }
 
@@ -68,21 +62,12 @@ MetricManager::MetricManager(std::unique_ptr<Timer> timer)
       _forceEventLogging(false),
       _snapshotUnsetMetrics(false),
       _consumerConfigChanged(false),
-      _metricManagerMetrics("metricmanager", "",
-              "Metrics for the metric manager upkeep tasks"),
-      _periodicHookLatency("periodichooklatency", "",
-              "Time in ms used to update a single periodic hook",
-              &_metricManagerMetrics),
-      _snapshotHookLatency("snapshothooklatency", "",
-              "Time in ms used to update a single snapshot hook",
-              &_metricManagerMetrics),
-      _resetLatency("resetlatency", "",
-              "Time in ms used to reset all metrics.", &_metricManagerMetrics),
-      _snapshotLatency("snapshotlatency", "",
-              "Time in ms used to take a snapshot",
-              &_metricManagerMetrics),
-      _sleepTimes("sleeptime", "", "Time in ms worker thread is sleeping",
-              &_metricManagerMetrics)
+      _metricManagerMetrics("metricmanager", "", "Metrics for the metric manager upkeep tasks"),
+      _periodicHookLatency("periodichooklatency", "", "Time in ms used to update a single periodic hook", &_metricManagerMetrics),
+      _snapshotHookLatency("snapshothooklatency", "", "Time in ms used to update a single snapshot hook", &_metricManagerMetrics),
+      _resetLatency("resetlatency", "", "Time in ms used to reset all metrics.", &_metricManagerMetrics),
+      _snapshotLatency("snapshotlatency", "", "Time in ms used to take a snapshot", &_metricManagerMetrics),
+      _sleepTimes("sleeptime", "", "Time in ms worker thread is sleeping", &_metricManagerMetrics)
 {
     registerMetric(getMetricLock(), _metricManagerMetrics);
 }
diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp
index d22eb9d6af9..83688ad993f 100644
--- a/metrics/src/vespa/metrics/metricset.cpp
+++ b/metrics/src/vespa/metrics/metricset.cpp
@@ -56,6 +56,14 @@ MetricSet::MetricSet(const MetricSet& other,
 
 MetricSet::~MetricSet() { }
 
+MetricSet*
+MetricSet::clone(std::vector<Metric::LP>& ownerList, CopyType type,
+                 MetricSet* owner, bool includeUnused) const
+{
+    return new MetricSet(*this, ownerList, type, owner, includeUnused);
+}
+
+
 const Metric*
 MetricSet::getMetricInternal(const String& name) const
 {
diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h
index 67c7981e8d0..b0ab0f4845c 100644
--- a/metrics/src/vespa/metrics/metricset.h
+++ b/metrics/src/vespa/metrics/metricset.h
@@ -53,8 +53,7 @@ public:
     void unregisterMetric(Metric& m);
 
     MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType type,
-                     MetricSet* owner, bool includeUnused = false) const override
-        { return new MetricSet(*this, ownerList, type, owner, includeUnused); }
+                     MetricSet* owner, bool includeUnused = false) const override;
 
     void reset();
 
diff --git a/metrics/src/vespa/metrics/namehash.h b/metrics/src/vespa/metrics/namehash.h
index 21cb9bdeedb..52c07b0f75f 100644
--- a/metrics/src/vespa/metrics/namehash.h
+++ b/metrics/src/vespa/metrics/namehash.h
@@ -55,11 +55,8 @@ public:
         mc._nameHash += sizeof(NameHash)
                      + _hash.getMemoryConsumption()
                      - sizeof(vespalib::hash_set<std::string>);
-        for (vespalib::hash_set<std::string>::const_iterator it(_hash.begin());
-             it != _hash.end(); ++it)
-        {
-            mc._nameHashStrings
-                    += mc.getStringMemoryUsage(*it, mc._nameHashUnique);
+        for (const std::string & name : _hash) {
+            mc._nameHashStrings += mc.getStringMemoryUsage(name, mc._nameHashUnique);
         }
     }
 };
diff --git a/metrics/src/vespa/metrics/printutils.h b/metrics/src/vespa/metrics/printutils.h
index 42f640e83d2..845804267bf 100644
--- a/metrics/src/vespa/metrics/printutils.h
+++ b/metrics/src/vespa/metrics/printutils.h
@@ -89,11 +89,8 @@ struct MetricSource {
             if (_prefixMatch
                 && static_cast<size_t>(_pathIndex + 1) == _path.size())
             {
-                for (std::vector<Metric*>::const_iterator it
-                        = set.getRegisteredMetrics().begin();
-                     it != set.getRegisteredMetrics().end(); ++it)
-                {
-                    checkForPrefixMatch(**it);
+                for (const Metric * entry : set.getRegisteredMetrics()) {
+                    checkForPrefixMatch(*entry);
                 }
                 return false;
             }
diff --git a/metrics/src/vespa/metrics/summetric.hpp b/metrics/src/vespa/metrics/summetric.hpp
index 6486afadc99..84769fffd13 100644
--- a/metrics/src/vespa/metrics/summetric.hpp
+++ b/metrics/src/vespa/metrics/summetric.hpp
@@ -51,11 +51,8 @@ SumMetric<AddendMetric>::SumMetric(const SumMetric<AddendMetric>& other,
     }
     std::vector<String> parentPath(other._owner->getPathVector());
     _metricsToSum.reserve(other._metricsToSum.size());
-    for (typename std::vector<const AddendMetric*>::const_iterator it
-             = other._metricsToSum.begin();
-         it != other._metricsToSum.end(); ++it)
-    {
-        std::vector<String> addendPath((**it).getPathVector());
+    for(const AddendMetric* m : _metricsToSum) {
+        std::vector<String> addendPath(m->getPathVector());
         MetricSet* newAddendParent = owner;
         for (uint32_t i=parentPath.size(), n=addendPath.size() - 1; i<n; ++i) {
             Metric* child = newAddendParent->getMetric(addendPath[i]);
@@ -73,8 +70,7 @@ SumMetric<AddendMetric>::SumMetric(const SumMetric<AddendMetric>& other,
             }
             newAddendParent = static_cast<MetricSet*>(child);
         }
-        Metric* child = newAddendParent->getMetric(
-                addendPath[addendPath.size() - 1]);
+        Metric* child = newAddendParent->getMetric(addendPath[addendPath.size() - 1]);
         if (child == 0) {
             throw vespalib::IllegalStateException(
                     "Metric " + addendPath[addendPath.size() - 1] + " in "
@@ -275,10 +271,8 @@ template<typename AddendMetric>
 bool
 SumMetric<AddendMetric>::used() const
 {
-    for(typename std::vector<const AddendMetric*>::const_iterator it(
-            _metricsToSum.begin()); it != _metricsToSum.end(); ++it)
-    {
-        if ((**it).used()) return true;
+    for(const AddendMetric* m : _metricsToSum) {
+        if (m->used()) return true;
     }
     return false;
 }
@@ -301,11 +295,9 @@ SumMetric<AddendMetric>::printDebug(std::ostream& out,
     out << "sum ";
     Metric::printDebug(out, indent);
     out << " {";
-    for(typename std::vector<const AddendMetric*>::const_iterator it(
-            _metricsToSum.begin()); it != _metricsToSum.end(); ++it)
-    {
+    for(const AddendMetric* m : _metricsToSum) {
         out << "\n" << indent << "  ";
-        (**it).printDebug(out, indent + "  ");
+        m->printDebug(out, indent + "  ");
     }
     out << "}";
 }