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 /config | |
| 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 'config')
5 files changed, 9 insertions, 3 deletions
diff --git a/config/src/vespa/config/frt/frtsource.cpp b/config/src/vespa/config/frt/frtsource.cpp index 94acabc5926..449ad5df1ba 100644 --- a/config/src/vespa/config/frt/frtsource.cpp +++ b/config/src/vespa/config/frt/frtsource.cpp @@ -3,6 +3,7 @@ #include "frtconfigresponse.h" #include "frtsource.h" #include <vespa/vespalib/util/closuretask.h> +#include <cassert> #include <vespa/log/log.h> LOG_SETUP(".config.frt.frtsource"); @@ -73,7 +74,7 @@ FRTSource::RequestDone(FRT_RPCRequest * request) LOG(debug, "request aborted, stopping"); return; } - assert(_currentRequest.get() != NULL); + assert(_currentRequest); // If this was error from FRT side and nothing to do with config, notify // connection about the error. if (request->IsError()) { diff --git a/config/src/vespa/config/frt/protocol.cpp b/config/src/vespa/config/frt/protocol.cpp index 4ad55726863..cfd248e5d86 100644 --- a/config/src/vespa/config/frt/protocol.cpp +++ b/config/src/vespa/config/frt/protocol.cpp @@ -4,6 +4,7 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> #include <sstream> +#include <cassert> #include <vespa/log/log.h> LOG_SETUP(".config.frt.protocol"); diff --git a/config/src/vespa/config/retriever/configretriever.cpp b/config/src/vespa/config/retriever/configretriever.cpp index 08e7f15f0c5..f144cf9aa99 100644 --- a/config/src/vespa/config/retriever/configretriever.cpp +++ b/config/src/vespa/config/retriever/configretriever.cpp @@ -2,6 +2,7 @@ #include "configretriever.h" #include <vespa/config/common/exceptions.h> +#include <cassert> using std::chrono::milliseconds; diff --git a/config/src/vespa/config/retriever/simpleconfigurer.cpp b/config/src/vespa/config/retriever/simpleconfigurer.cpp index 1f8868f9d6a..0091fa7bfd5 100644 --- a/config/src/vespa/config/retriever/simpleconfigurer.cpp +++ b/config/src/vespa/config/retriever/simpleconfigurer.cpp @@ -1,8 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +#include "simpleconfigurer.h" +#include <cassert> + #include <vespa/log/log.h> LOG_SETUP(".config.retriever.simpleconfigurer"); -#include "simpleconfigurer.h" namespace config { @@ -12,7 +14,7 @@ SimpleConfigurer::SimpleConfigurer(SimpleConfigRetriever::UP retriever, SimpleCo _thread(*this), _started(false) { - assert(_retriever.get() != NULL); + assert(_retriever); } void diff --git a/config/src/vespa/config/subscription/sourcespec.cpp b/config/src/vespa/config/subscription/sourcespec.cpp index 30926d75465..326b3191fd0 100644 --- a/config/src/vespa/config/subscription/sourcespec.cpp +++ b/config/src/vespa/config/subscription/sourcespec.cpp @@ -10,6 +10,7 @@ #include <vespa/config/set/configinstancesourcefactory.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <vespa/config/print/asciiconfigwriter.h> +#include <cassert> namespace config { |