aboutsummaryrefslogtreecommitdiffstats
path: root/metrics
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 16:59:55 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-07 17:13:05 +0000
commit6166dd0e28ab21be14a7c5018958f394d8e779db (patch)
tree9f1ebb0f4920ad377fda2b0de44a4a45d7ec121a /metrics
parentd8365f1cde0c00a5a671f87c0baad461beff28c2 (diff)
Remove broken copy and move constructor and assignment operatoos on vespalib::Lock and vespalib::Monitor.
Also repair broken usages of the same.
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/vespa/metrics/metricmanager.cpp1
-rw-r--r--metrics/src/vespa/metrics/metricsnapshot.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 84e92c2c316..7db9686d5c8 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -13,6 +13,7 @@
#include <vespa/vespalib/stllike/hashtable.hpp>
#include <sstream>
#include <algorithm>
+#include <cassert>
#include <vespa/log/bufferedlogger.h>
LOG_SETUP(".metrics.manager");
diff --git a/metrics/src/vespa/metrics/metricsnapshot.cpp b/metrics/src/vespa/metrics/metricsnapshot.cpp
index 86a33f0993f..f7460c8b6ad 100644
--- a/metrics/src/vespa/metrics/metricsnapshot.cpp
+++ b/metrics/src/vespa/metrics/metricsnapshot.cpp
@@ -1,8 +1,9 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "metricsnapshot.h"
#include "metricmanager.h"
-#include <vespa/log/log.h>
+#include <cassert>
+#include <vespa/log/log.h>
LOG_SETUP(".metrics.snapshot");
namespace metrics {