diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-07 16:59:55 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-07 17:13:05 +0000 |
| commit | 6166dd0e28ab21be14a7c5018958f394d8e779db (patch) | |
| tree | 9f1ebb0f4920ad377fda2b0de44a4a45d7ec121a /storageframework | |
| parent | d8365f1cde0c00a5a671f87c0baad461beff28c2 (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 'storageframework')
5 files changed, 4 insertions, 2 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp index 2595514e6f4..ad2d0df5824 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp @@ -4,6 +4,7 @@ #include <vespa/storageframework/storageframework.h> #include <vespa/metrics/metricmanager.h> #include <vespa/vespalib/util/exceptions.h> +#include <cassert> namespace storage::framework::defaultimplementation { diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/testcomponentregister.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/testcomponentregister.cpp index 2e90e1ae3ee..5c8e70f2773 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/testcomponentregister.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/testcomponentregister.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "testcomponentregister.h" +#include <cassert> namespace storage::framework::defaultimplementation { diff --git a/storageframework/src/vespa/storageframework/generic/component/component.cpp b/storageframework/src/vespa/storageframework/generic/component/component.cpp index b0569bdee41..3818a2865d9 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.cpp +++ b/storageframework/src/vespa/storageframework/generic/component/component.cpp @@ -4,6 +4,7 @@ #include "componentregister.h" #include <vespa/storageframework/generic/metric/metricregistrator.h> #include <vespa/storageframework/generic/thread/threadpool.h> +#include <cassert> namespace storage::framework { diff --git a/storageframework/src/vespa/storageframework/generic/component/component.h b/storageframework/src/vespa/storageframework/generic/component/component.h index 165d9c47d6e..c91d7feb532 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.h +++ b/storageframework/src/vespa/storageframework/generic/component/component.h @@ -110,7 +110,6 @@ class Component : private ManagedComponent void setClock(Clock& c) override { _clock = &c; } void setThreadPool(ThreadPool& tp) override { _threadPool = &tp; } void setUpgradeFlag(UpgradeFlags flag) override { - assert(_upgradeFlag.is_lock_free()); _upgradeFlag.store(flag, std::memory_order_relaxed); } void open() override; diff --git a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp index dc4f8bbc1f1..c56a6fbb750 100644 --- a/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp +++ b/storageframework/src/vespa/storageframework/generic/thread/tickingthread.cpp @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "tickingthread.h" #include "threadpool.h" -#include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <cassert> namespace storage::framework { |