diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-01 13:12:41 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-08 21:38:36 +0000 |
commit | 72e9888bcccbc384d2485409ba055633131ed512 (patch) | |
tree | 79eb45091ead4ffeff40a1baf6cebe33edf7a9d4 /config | |
parent | fa93596f761848645b3ee133bfd665ece2cc06d6 (diff) |
Specify destructors explicit to control inlining.
Conflicts:
build_settings.cmake
Diffstat (limited to 'config')
4 files changed, 12 insertions, 4 deletions
diff --git a/config/src/vespa/config/common/payload_converter.cpp b/config/src/vespa/config/common/payload_converter.cpp index 5dc45c12fa3..0dbbd62f392 100644 --- a/config/src/vespa/config/common/payload_converter.cpp +++ b/config/src/vespa/config/common/payload_converter.cpp @@ -12,6 +12,8 @@ PayloadConverter::PayloadConverter(const Inspector & inspector) _lines() {} +PayloadConverter::~PayloadConverter() { } + const std::vector<vespalib::string> & PayloadConverter::convert() { diff --git a/config/src/vespa/config/common/payload_converter.h b/config/src/vespa/config/common/payload_converter.h index 3a9d53f4c77..63a4b0a7964 100644 --- a/config/src/vespa/config/common/payload_converter.h +++ b/config/src/vespa/config/common/payload_converter.h @@ -14,6 +14,7 @@ namespace config { class PayloadConverter : public vespalib::slime::ObjectTraverser, public vespalib::slime::ArrayTraverser { public: PayloadConverter(const vespalib::slime::Inspector & inspector); + ~PayloadConverter(); const std::vector<vespalib::string> & convert(); void field(const vespalib::Memory & symbol, const vespalib::slime::Inspector & inspector); void entry(size_t idx, const vespalib::slime::Inspector & inspector); diff --git a/config/src/vespa/config/helper/configpoller.cpp b/config/src/vespa/config/helper/configpoller.cpp index 281fe8df140..ee9ec1bbc31 100644 --- a/config/src/vespa/config/helper/configpoller.cpp +++ b/config/src/vespa/config/helper/configpoller.cpp @@ -1,7 +1,9 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +#include "configpoller.h" + #include <vespa/log/log.h> LOG_SETUP(".config.helper.configpoller"); -#include "configpoller.h" namespace config { @@ -14,6 +16,8 @@ ConfigPoller::ConfigPoller(const IConfigContext::SP & context) { } +ConfigPoller::~ConfigPoller() { } + void ConfigPoller::run() { diff --git a/config/src/vespa/config/helper/configpoller.h b/config/src/vespa/config/helper/configpoller.h index f614cab5175..af660f6c536 100644 --- a/config/src/vespa/config/helper/configpoller.h +++ b/config/src/vespa/config/helper/configpoller.h @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "ifetchercallback.h" +#include "ihandle.h" #include <vespa/config/subscription/configsubscriber.h> #include <vespa/config/common/timingvalues.h> #include <vespa/vespalib/util/runnable.h> -#include "ifetchercallback.h" -#include "ihandle.h" namespace config { @@ -16,7 +16,8 @@ namespace config { class ConfigPoller : public vespalib::Runnable { public: ConfigPoller(const IConfigContext::SP & context); - void run(); + ~ConfigPoller(); + void run() override; template <typename ConfigType> void subscribe(const std::string & configId, IFetcherCallback<ConfigType> * callback, uint64_t subscribeTimeout = DEFAULT_SUBSCRIBE_TIMEOUT); void subscribeGenerationChanges(IGenerationCallback * callback) { _genCallback = callback; } |