diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-01 10:45:38 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-01 10:45:38 +0000 |
commit | 99516f7e415a6d48f5b33bd6297ed3cff695fda8 (patch) | |
tree | 294ec359c7dc562ebf72c1c8e4673ffba42ead80 /config/src | |
parent | 2e4adfad029cba7732833ab83dd6cc11760d48ab (diff) |
Deinline destructors in config
Diffstat (limited to 'config/src')
-rw-r--r-- | config/src/tests/configretriever/configretriever.cpp | 5 | ||||
-rw-r--r-- | config/src/vespa/config/frt/protocol.h | 7 | ||||
-rw-r--r-- | config/src/vespa/config/retriever/configsnapshot.cpp | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/config/src/tests/configretriever/configretriever.cpp b/config/src/tests/configretriever/configretriever.cpp index cc36614d4c5..3e4cd9bf980 100644 --- a/config/src/tests/configretriever/configretriever.cpp +++ b/config/src/tests/configretriever/configretriever.cpp @@ -38,7 +38,7 @@ struct ConfigTestFixture { std::shared_ptr<IConfigContext> context; int idcounter; - ConfigTestFixture(const std::string & id) + explicit ConfigTestFixture(const std::string & id) : configId(id), bootstrapBuilder(), componentConfig(), @@ -141,10 +141,13 @@ public: Slime & getData() { return _data; } + ~FixedPayload() override; private: Slime _data; }; +FixedPayload::~FixedPayload() = default; + } ConfigValue createKeyValueV2(const vespalib::string & key, const vespalib::string & value) diff --git a/config/src/vespa/config/frt/protocol.h b/config/src/vespa/config/frt/protocol.h index f99a4aee8a3..b8d7a5ff7fc 100644 --- a/config/src/vespa/config/frt/protocol.h +++ b/config/src/vespa/config/frt/protocol.h @@ -13,9 +13,7 @@ namespace vespalib { } } -namespace config { - -namespace protocol { +namespace config::protocol { int readProtocolVersion(); int readTraceLevel(); @@ -87,6 +85,3 @@ DecompressedData decompress(const char * buf, uint32_t len, const CompressionTyp } } - -} - diff --git a/config/src/vespa/config/retriever/configsnapshot.cpp b/config/src/vespa/config/retriever/configsnapshot.cpp index 293a90ebbba..8c79aec22f4 100644 --- a/config/src/vespa/config/retriever/configsnapshot.cpp +++ b/config/src/vespa/config/retriever/configsnapshot.cpp @@ -237,10 +237,13 @@ public: } Slime & getData() { return _data; } + ~FixedPayload() override; private: Slime _data; }; +FixedPayload::~FixedPayload() = default; + } std::pair<int64_t, ConfigValue> |