Deinline

11 files changed, 31 insertions, 15 deletions

diff --git a/document/src/vespa/document/update/fieldpathupdate.cpp b/document/src/vespa/document/update/fieldpathupdate.cpp
index a8a42f69215..fa4cad5fa8c 100644
--- a/document/src/vespa/document/update/fieldpathupdate.cpp
+++ b/document/src/vespa/document/update/fieldpathupdate.cpp
@@ -38,7 +38,7 @@ parseDocumentSelection(vespalib::stringref query, const DocumentTypeRepo& repo)
 
 }  // namespace
 
-FieldPathUpdate::FieldPathUpdate(FieldPathUpdateType type)
+FieldPathUpdate::FieldPathUpdate(FieldPathUpdateType type) noexcept
     : _type(type),
       _originalFieldPath(),
       _originalWhereClause()
diff --git a/document/src/vespa/document/update/fieldpathupdate.h b/document/src/vespa/document/update/fieldpathupdate.h
index fb205b67a60..7074b9edf4c 100644
--- a/document/src/vespa/document/update/fieldpathupdate.h
+++ b/document/src/vespa/document/update/fieldpathupdate.h
@@ -61,7 +61,7 @@ public:
 
 protected:
     /** To be used for deserialization */
-    FieldPathUpdate(FieldPathUpdateType type);
+    FieldPathUpdate(FieldPathUpdateType type) noexcept;
     FieldPathUpdate(const FieldPathUpdate &);
     FieldPathUpdate & operator =(const FieldPathUpdate &);
 
diff --git a/document/src/vespa/document/update/removefieldpathupdate.cpp b/document/src/vespa/document/update/removefieldpathupdate.cpp
index 1b94039240b..a2909a2a3e1 100644
--- a/document/src/vespa/document/update/removefieldpathupdate.cpp
+++ b/document/src/vespa/document/update/removefieldpathupdate.cpp
@@ -8,11 +8,13 @@ namespace document {
 
 using namespace fieldvalue;
 
-RemoveFieldPathUpdate::RemoveFieldPathUpdate()
+RemoveFieldPathUpdate::RemoveFieldPathUpdate() noexcept
     : FieldPathUpdate(Remove)
 {
 }
 
+RemoveFieldPathUpdate::~RemoveFieldPathUpdate() = default;
+
 RemoveFieldPathUpdate::RemoveFieldPathUpdate(stringref fieldPath, stringref whereClause)
     : FieldPathUpdate(Remove, fieldPath, whereClause)
 {
@@ -36,7 +38,7 @@ namespace {
 
 class RemoveIteratorHandler : public IteratorHandler {
 public:
-    RemoveIteratorHandler() {}
+    RemoveIteratorHandler() = default;
 
     ModificationStatus doModify(FieldValue &) override {
         return ModificationStatus::REMOVED;
diff --git a/document/src/vespa/document/update/removefieldpathupdate.h b/document/src/vespa/document/update/removefieldpathupdate.h
index df71fcd717c..888effb029d 100644
--- a/document/src/vespa/document/update/removefieldpathupdate.h
+++ b/document/src/vespa/document/update/removefieldpathupdate.h
@@ -9,12 +9,13 @@ class RemoveFieldPathUpdate final : public FieldPathUpdate
 {
 public:
     /** For deserialization */
-    RemoveFieldPathUpdate();
+    RemoveFieldPathUpdate() noexcept;
     RemoveFieldPathUpdate(RemoveFieldPathUpdate &&) noexcept = default;
     RemoveFieldPathUpdate & operator =(RemoveFieldPathUpdate &&) noexcept = default;
     RemoveFieldPathUpdate(const RemoveFieldPathUpdate &) = delete;
     RemoveFieldPathUpdate & operator =(const RemoveFieldPathUpdate &) = delete;
     RemoveFieldPathUpdate(stringref fieldPath, stringref whereClause = stringref());
+    ~RemoveFieldPathUpdate() override;
 
     void print(std::ostream& out, bool verbose, const std::string& indent) const override;
 
diff --git a/jrt_test/src/tests/rpc-error/test-errors.cpp b/jrt_test/src/tests/rpc-error/test-errors.cpp
index 86d699e530e..e64c2abfff6 100644
--- a/jrt_test/src/tests/rpc-error/test-errors.cpp
+++ b/jrt_test/src/tests/rpc-error/test-errors.cpp
@@ -12,6 +12,8 @@ private:
     FRT_Target     *target;
 
 public:
+    TestErrors();
+    ~TestErrors() override;
     void init(const char *spec) {
 	    client = & server.supervisor();
         target = client->GetTarget(spec);
@@ -31,6 +33,8 @@ public:
     int Main() override;
 };
 
+TestErrors::TestErrors() = default;
+TestErrors::~TestErrors() = default;
 
 void
 TestErrors::testNoError()
diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.cpp b/messagebus/src/vespa/messagebus/testlib/testserver.cpp
index d289c372fda..4393dfccccc 100644
--- a/messagebus/src/vespa/messagebus/testlib/testserver.cpp
+++ b/messagebus/src/vespa/messagebus/testlib/testserver.cpp
@@ -13,6 +13,8 @@ VersionedRPCNetwork::VersionedRPCNetwork(const RPCNetworkParams &params) :
     _version(vespalib::Vtag::currentVersion)
 {}
 
+VersionedRPCNetwork::~VersionedRPCNetwork() = default;
+
 void
 VersionedRPCNetwork::setVersion(const vespalib::Version &version)
 {
diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.h b/messagebus/src/vespa/messagebus/testlib/testserver.h
index 1ea96c3e13f..f3f349e52b9 100644
--- a/messagebus/src/vespa/messagebus/testlib/testserver.h
+++ b/messagebus/src/vespa/messagebus/testlib/testserver.h
@@ -23,6 +23,7 @@ protected:
 
 public:
     VersionedRPCNetwork(const RPCNetworkParams &params);
+    ~VersionedRPCNetwork() override;
     void setVersion(const vespalib::Version &version);
 };
 
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 7caf03d640b..604e9c46b80 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -898,13 +898,17 @@ struct NestedDimensionTestMetricSet : MetricSet
 {
     DimensionTestMetricSet nestedSet;
 
-    NestedDimensionTestMetricSet()
-        : MetricSet("outer", {{"fancy", "stuff"}}, ""),
-          nestedSet(this)
-    {
-    }
+    NestedDimensionTestMetricSet();
+    ~NestedDimensionTestMetricSet();
 };
 
+NestedDimensionTestMetricSet::NestedDimensionTestMetricSet()
+    : MetricSet("outer", {{"fancy", "stuff"}}, ""),
+      nestedSet(this)
+{
+}
+NestedDimensionTestMetricSet::~NestedDimensionTestMetricSet() = default;
+
 }
 
 TEST_F(MetricManagerTest, json_output_can_nest_dimensions_from_multiple_metric_sets)
diff --git a/slobrok/src/tests/service_map_history/service_map_history_test.cpp b/slobrok/src/tests/service_map_history/service_map_history_test.cpp
index 398ec91feb2..81058d9c725 100644
--- a/slobrok/src/tests/service_map_history/service_map_history_test.cpp
+++ b/slobrok/src/tests/service_map_history/service_map_history_test.cpp
@@ -14,7 +14,7 @@ using Map = std::map<vespalib::string, vespalib::string>;
 struct Dumper : ServiceMapHistory::DiffCompletionHandler {
     std::unique_ptr<MapDiff> got = {};
     void handle(MapDiff diff) override {
-        got = std::make_unique<MapDiff>(diff);
+        got = std::make_unique<MapDiff>(std::move(diff));
     }
 };
 
@@ -22,7 +22,7 @@ MapDiff diffGen(ServiceMapHistory &history, uint32_t gen) {
     Dumper dumper;
     history.asyncGenerationDiff(&dumper, GenCnt(gen));
     EXPECT_TRUE(dumper.got);
-    return *dumper.got;
+    return std::move(*dumper.got);
 }
 
 Map dump(ServiceMapHistory &history) {
@@ -60,7 +60,7 @@ TEST(ServiceMapHistoryTest, empty_inspection) {
         empty2.asyncGenerationDiff(&dumper, gen);
     }
     EXPECT_TRUE(dumper.got);
-    auto diff1 = *dumper.got;
+    auto diff1 = std::move(*dumper.got);
     EXPECT_FALSE(diff1.is_full_dump());
     EXPECT_EQ(diff1.fromGen, gen);
     EXPECT_TRUE(diff1.removed.empty());
@@ -140,7 +140,7 @@ TEST(ServiceMapHistoryTest, full_inspection) {
         EXPECT_FALSE(dumper.got);
     }
     EXPECT_TRUE(dumper.got);
-    auto diff1 = *dumper.got;
+    auto diff1 = std::move(*dumper.got);
     EXPECT_EQ(diff1.fromGen, GenCnt(1987));
     EXPECT_TRUE(diff1.removed.empty());
     EXPECT_TRUE(diff1.updated.empty());
@@ -162,7 +162,7 @@ public:
         got_updates = diff.updated.size();
     }
 
-    ~MockListener();
+    ~MockListener() override;
 };
 
 MockListener::~MockListener() = default;
diff --git a/slobrok/src/vespa/slobrok/server/map_diff.cpp b/slobrok/src/vespa/slobrok/server/map_diff.cpp
index ea71e1c1269..fb086fbe45b 100644
--- a/slobrok/src/vespa/slobrok/server/map_diff.cpp
+++ b/slobrok/src/vespa/slobrok/server/map_diff.cpp
@@ -4,6 +4,7 @@
 
 namespace slobrok {
 
+MapDiff::MapDiff(MapDiff &&) noexcept = default;
 MapDiff::~MapDiff() = default;
 
 } // namespace slobrok
diff --git a/slobrok/src/vespa/slobrok/server/map_diff.h b/slobrok/src/vespa/slobrok/server/map_diff.h
index a28336eb2e4..638d4cd5d4c 100644
--- a/slobrok/src/vespa/slobrok/server/map_diff.h
+++ b/slobrok/src/vespa/slobrok/server/map_diff.h
@@ -29,6 +29,7 @@ struct MapDiff {
       : MapDiff(0, {}, std::move(mappings), to)
     {}
 
+    MapDiff(MapDiff &&) noexcept;
     ~MapDiff();
     
     // is this a diff from the empty map: