diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-09 09:36:23 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-09 09:36:23 +0000 |
| commit | 22d0e57fa40fdc1a81eb5f419aea3e039bb76bb0 (patch) | |
| tree | a3ad0351fc177a5960d192aa3f1e87ca8bd30296 /metrics | |
| parent | 9275f7cea7fe225bb5700e160dc8cf03d45387bc (diff) | |
Use assignment to avoid gcc 8 ambiguity.
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/metricset.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp index a8e22c8dfc4..9fb731d7583 100644 --- a/metrics/src/vespa/metrics/metricset.cpp +++ b/metrics/src/vespa/metrics/metricset.cpp @@ -254,7 +254,7 @@ MetricSet::addTo(Metric& other, std::vector<Metric::UP> *ownerList) const std::vector<Metric*> newOrder; newOrder.reserve(o._metricOrder.size() + newMetrics.size()); for (const Metric* metric : _metricOrder) { - TmpString v(metric->getMangledName()); + TmpString v = metric->getMangledName(); target = std::lower_bound(map2.begin(), map2.end(), v); if ((target != map2.end()) && (target->first == v)) { newOrder.push_back(target->second); @@ -267,7 +267,7 @@ MetricSet::addTo(Metric& other, std::vector<Metric::UP> *ownerList) const } // If target had unique metrics, add them at the end for (Metric* metric : o._metricOrder) { - TmpString v(metric->getMangledName()); + TmpString v = metric->getMangledName(); if ( ! std::binary_search(map1.begin(), map1.end(), v) ) { LOG(debug, "Metric %s exist in one snapshot but not other." "Order will be messed up. Adding target unique " |