Fix remaining inline warnings for compilation with -Og

22 files changed, 52 insertions, 12 deletions

diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
index 7565d99a8aa..faea06a19a3 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
@@ -24,6 +24,9 @@ FRTConfigRequestFactory::FRTConfigRequestFactory(int protocolVersion, int traceL
 {
 }
 
+FRTConfigRequestFactory::~FRTConfigRequestFactory() {
+}
+
 FRTConfigRequest::UP
 FRTConfigRequestFactory::createConfigRequest(const ConfigKey & key, Connection * connection, const ConfigState & state, int64_t serverTimeout) const
 {
diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.h b/config/src/vespa/config/frt/frtconfigrequestfactory.h
index 98d7175a352..041af30b35a 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.h
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.h
@@ -19,6 +19,8 @@ class FRTConfigRequestFactory
 {
 public:
     FRTConfigRequestFactory(int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
+    ~FRTConfigRequestFactory();
+
     FRTConfigRequest::UP createConfigRequest(const ConfigKey & key, Connection * connection, const ConfigState & state, int64_t serverTimeout) const;
 private:
     const int _protocolVersion;
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.cpp
index ef87fa631fe..641feb85f9d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.cpp
@@ -8,13 +8,14 @@ namespace documentapi {
 EmptyBucketsMessage::EmptyBucketsMessage() :
     _bucketIds()
 {
-    // empty
 }
 
 EmptyBucketsMessage::EmptyBucketsMessage(const std::vector<document::BucketId> &bucketIds) :
     _bucketIds(bucketIds)
 {
-    // empty
+}
+
+EmptyBucketsMessage::~EmptyBucketsMessage() {
 }
 
 void
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h
index bd1805a4a17..78beafdd46d 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/emptybucketsmessage.h
@@ -22,6 +22,7 @@ protected:
 public:
     EmptyBucketsMessage(); // must be serialized into
     EmptyBucketsMessage(const std::vector<document::BucketId> &bucketIds);
+    ~EmptyBucketsMessage();
 
     std::vector<document::BucketId> &getBucketIds() { return _bucketIds; }
     const std::vector<document::BucketId> &getBucketIds() const { return _bucketIds; }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
index 87ce618d662..edc6379dd63 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.cpp
@@ -27,6 +27,9 @@ GetDocumentMessage::GetDocumentMessage(const document::DocumentId &documentId,
 {
 }
 
+GetDocumentMessage::~GetDocumentMessage() {
+}
+
 DocumentReply::UP
 GetDocumentMessage::doCreateReply() const
 {
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
index 40c184c2136..2ef26ff2730 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h
@@ -48,6 +48,8 @@ public:
     GetDocumentMessage(const document::DocumentId &documentId,
                        const vespalib::stringref & fieldSet);
 
+    ~GetDocumentMessage();
+
     /**
      * Returns the identifier of the document to retrieve.
      *
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.cpp
index 28625b6b1f5..09f627a0d2e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.cpp
@@ -15,7 +15,6 @@ MultiOperationMessage::MultiOperationMessage(const document::DocumentTypeRepo::S
     _operations(repo, 0, 0),
     _keepTimeStamps(false)
 {
-    // empty
 }
 
 MultiOperationMessage::MultiOperationMessage(const document::DocumentTypeRepo::SP & repo, const document::BucketId& bucketId, int bufferSize) :
@@ -54,6 +53,9 @@ MultiOperationMessage::MultiOperationMessage(const document::BucketId& bucketId,
     _operations = vdslib::DocumentList(operations.getTypeRepo(), &_buffer[0], _buffer.size(), true);
 }
 
+MultiOperationMessage::~MultiOperationMessage() {
+}
+
 void
 MultiOperationMessage::setOperations(const document::DocumentTypeRepo::SP & repo, const std::vector<char> &buffer)
 {
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h
index 4c6f8bf9de7..89d6e0ad725 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/multioperationmessage.h
@@ -35,6 +35,7 @@ public:
     MultiOperationMessage(const document::DocumentTypeRepo::SP & repo, const document::BucketId& bucketId,
                           const std::vector<char>& buffer, bool keepTimeStamps = false);
     MultiOperationMessage(const document::BucketId& bucketId, vdslib::DocumentList& docList, bool keepTimeStamps = false);
+    ~MultiOperationMessage();
 
     static mbus::Message::UP create(const document::DocumentTypeRepo::SP & repo, const document::BucketId& bucketId, const vdslib::OperationList& operations);
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
index 0d83e0f085e..02bf38c0139 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
@@ -9,14 +9,15 @@ RemoveDocumentMessage::RemoveDocumentMessage() :
     TestAndSetMessage(),
     _documentId()
 {
-    // empty
 }
 
 RemoveDocumentMessage::RemoveDocumentMessage(const document::DocumentId& documentId) :
     TestAndSetMessage(),
     _documentId(documentId)
 {
-    // empty
+}
+
+RemoveDocumentMessage::~RemoveDocumentMessage() {
 }
 
 DocumentReply::UP
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h
index a47e35f3098..2b64e6f7893 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h
@@ -33,6 +33,8 @@ public:
      */
     RemoveDocumentMessage(const document::DocumentId& id);
 
+    ~RemoveDocumentMessage();
+
     /**
      * Returns the identifier of the document to remove.
      *
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.cpp
index 08300299706..e07566cf22f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.cpp
@@ -26,6 +26,9 @@ RemoveLocationMessage::RemoveLocationMessage(
     }
 }
 
+RemoveLocationMessage::~RemoveLocationMessage() {
+}
+
 DocumentReply::UP
 RemoveLocationMessage::doCreateReply() const {
     return DocumentReply::UP(
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
index ce15fe4eda0..c56ef8b0ede 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
@@ -15,6 +15,7 @@ namespace documentapi {
 class RemoveLocationMessage : public DocumentMessage {
 public:
     RemoveLocationMessage(const document::BucketIdFactory& factory, document::select::Parser& parser, const string& documentSelection);
+    ~RemoveLocationMessage();
 
     const string& getDocumentSelection() const { return _documentSelection; }
     const document::BucketId& getBucketId() const { return _bucketId; };
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
index 4df05b4f3de..b602799318e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.cpp
@@ -17,6 +17,9 @@ StatBucketMessage::StatBucketMessage(document::BucketId bucket, const string& do
     _documentSelection(documentSelection)
 {}
 
+StatBucketMessage::~StatBucketMessage() {
+}
+
 DocumentReply::UP
 StatBucketMessage::doCreateReply() const
 {
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
index 1a04cd8a298..1b3a51b0b44 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketmessage.h
@@ -27,6 +27,8 @@ public:
      */
     StatBucketMessage(document::BucketId bucket, const string& documentSelection);
 
+    ~StatBucketMessage();
+
     /**
      * Returns the bucket to stat.
      *
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 1d423eff543..b86a82272ed 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -61,14 +61,15 @@ DestroyVisitorMessage::DestroyVisitorMessage() :
     DocumentMessage(),
     _instanceId()
 {
-    // empty
 }
 
 DestroyVisitorMessage::DestroyVisitorMessage(const string& instanceId) :
     DocumentMessage(),
     _instanceId(instanceId)
 {
-    // empty
+}
+
+DestroyVisitorMessage::~DestroyVisitorMessage() {
 }
 
 DocumentReply::UP
@@ -100,7 +101,9 @@ VisitorInfoMessage::VisitorInfoMessage() :
     _finishedBuckets(),
     _errorMessage()
 {
-    // empty
+}
+
+VisitorInfoMessage::~VisitorInfoMessage() {
 }
 
 DocumentReply::UP
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
index 8a40bd05127..6fe85b9efcb 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
@@ -136,6 +136,7 @@ public:
 
     DestroyVisitorMessage(); // must be deserialized into
     DestroyVisitorMessage(const string &instanceId);
+    ~DestroyVisitorMessage();
 
     const string& getInstanceId() const { return _instanceId; }
     void setInstanceId(const string& id) { _instanceId = id; }
@@ -200,6 +201,7 @@ public:
     typedef std::unique_ptr<VisitorInfoMessage> UP;
 
     VisitorInfoMessage();
+    ~VisitorInfoMessage();
 
     std::vector<document::BucketId>& getFinishedBuckets() { return _finishedBuckets; }
     const std::vector<document::BucketId>& getFinishedBuckets() const { return _finishedBuckets; }
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp
index 872be49f9b4..a00537ffa50 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp
+++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.cpp
@@ -100,6 +100,9 @@ DenseTensorBuilder::DenseTensorBuilder()
 {
 }
 
+DenseTensorBuilder::~DenseTensorBuilder() {
+}
+
 DenseTensorBuilder::Dimension
 DenseTensorBuilder::defineDimension(const vespalib::string &dimension,
                                     size_t dimensionSize)
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h
index 722e7835d32..0a8a33f4c2d 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h
+++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_builder.h
@@ -30,6 +30,7 @@ private:
 
 public:
     DenseTensorBuilder();
+    ~DenseTensorBuilder();
 
     Dimension defineDimension(const vespalib::string &dimension, size_t dimensionSize);
     DenseTensorBuilder &addLabel(Dimension dimension, size_t label);
diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp
index 4e794a49d97..17a0cbc169f 100644
--- a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp
+++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp
@@ -19,7 +19,9 @@ CustomPolicy::CustomPolicy(bool selectOnRetry,
     _consumableErrors(consumableErrors),
     _routes(routes)
 {
-    // empty
+}
+
+CustomPolicy::~CustomPolicy() {
 }
 
 void
@@ -78,14 +80,12 @@ CustomPolicyFactory::CustomPolicyFactory() :
     _selectOnRetry(true),
     _consumableErrors()
 {
-    // empty
 }
 
 CustomPolicyFactory::CustomPolicyFactory(bool selectOnRetry) :
     _selectOnRetry(selectOnRetry),
     _consumableErrors()
 {
-    // empty
 }
 
 CustomPolicyFactory::CustomPolicyFactory(bool selectOnRetry, uint32_t consumableError) :
@@ -99,7 +99,6 @@ CustomPolicyFactory::CustomPolicyFactory(bool selectOnRetry, const std::vector<u
     _selectOnRetry(selectOnRetry),
     _consumableErrors(consumableErrors)
 {
-    // empty
 }
 
 IRoutingPolicy::UP
diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.h b/messagebus/src/vespa/messagebus/testlib/custompolicy.h
index 4fec4efe7c2..13318eb6c63 100644
--- a/messagebus/src/vespa/messagebus/testlib/custompolicy.h
+++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.h
@@ -16,6 +16,7 @@ public:
     CustomPolicy(bool selectOnRetry,
                  const std::vector<uint32_t> consumableErrors,
                  const std::vector<Route> &routes);
+    ~CustomPolicy();
 
     void select(RoutingContext &context) override;
     void merge(RoutingContext &context) override;
diff --git a/storageapi/src/vespa/storageapi/message/visitor.cpp b/storageapi/src/vespa/storageapi/message/visitor.cpp
index db98733c798..b61a3706bcd 100644
--- a/storageapi/src/vespa/storageapi/message/visitor.cpp
+++ b/storageapi/src/vespa/storageapi/message/visitor.cpp
@@ -182,6 +182,9 @@ VisitorInfoCommand::VisitorInfoCommand()
 {
 }
 
+VisitorInfoCommand::~VisitorInfoCommand() {
+}
+
 void
 VisitorInfoCommand::print(std::ostream& out, bool verbose,
                           const std::string& indent) const
diff --git a/storageapi/src/vespa/storageapi/message/visitor.h b/storageapi/src/vespa/storageapi/message/visitor.h
index 66bd31b9825..44362853566 100644
--- a/storageapi/src/vespa/storageapi/message/visitor.h
+++ b/storageapi/src/vespa/storageapi/message/visitor.h
@@ -215,6 +215,7 @@ private:
 
 public:
     VisitorInfoCommand();
+    ~VisitorInfoCommand();
 
     void setErrorCode(const ReturnCode& code) { _error = code; }
     void setCompleted() { _completed = true; }