diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:51 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:41:51 +0200 |
commit | 00bed0fb454f95a6c09ac2db557611b7b6b77a1a (patch) | |
tree | 2370ddde547f07b3bf3a2e0b149a8f5f90c89e79 /documentapi | |
parent | 0f646f10b377b90fc37e9911f9fe383d112ff157 (diff) |
Fix warnings hidden earlier due to including application headers as system includes
Diffstat (limited to 'documentapi')
20 files changed, 49 insertions, 20 deletions
diff --git a/documentapi/src/tests/messagebus/messagebus_test.cpp b/documentapi/src/tests/messagebus/messagebus_test.cpp index 4e7620dac05..58fc96b2e78 100644 --- a/documentapi/src/tests/messagebus/messagebus_test.cpp +++ b/documentapi/src/tests/messagebus/messagebus_test.cpp @@ -17,6 +17,8 @@ class Test : public vespalib::TestApp { DocumentTypeRepo::SP _repo; public: + Test(); + ~Test(); int Main() override; private: @@ -39,6 +41,9 @@ Test::Main() TEST_DONE(); } +Test::Test() {} +Test::~Test() {} + void Test::testMessage() { const document::DataType *testdoc_type = _repo->getDocumentType("testdoc"); diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index b1135a30032..3527e62840b 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -1,9 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/document/base/testdocrepo.h> -#include <vespa/document/datatype/datatype.h> -#include <vespa/document/fieldvalue/document.h> -#include <vespa/document/fieldvalue/longfieldvalue.h> +#include "testframe.h" + #include <vespa/documentapi/documentapi.h> #include <vespa/documentapi/messagebus/policies/andpolicy.h> #include <vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h> @@ -16,19 +14,17 @@ #include <vespa/documentapi/messagebus/policies/searchrowpolicy.h> #include <vespa/documentapi/messagebus/policies/storagepolicy.h> #include <vespa/documentapi/messagebus/policies/subsetservicepolicy.h> -#include <vespa/documentapi/messagebus/systemstate/systemstatehandle.h> -#include <limits> #include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/errorcode.h> -#include <vespa/messagebus/routing/routingcontext.h> #include <vespa/messagebus/routing/routingnode.h> #include <vespa/messagebus/routing/routingtable.h> #include <vespa/messagebus/routing/policydirective.h> #include <vespa/messagebus/testlib/testserver.h> #include <vespa/vdslib/container/mutabledocumentlist.h> #include <vespa/vdslib/state/clusterstate.h> +#include <vespa/document/base/testdocrepo.h> +#include <vespa/document/fieldvalue/longfieldvalue.h> #include <vespa/vespalib/testkit/testapp.h> -#include "testframe.h" + #include <vespa/log/log.h> LOG_SETUP("policies_test"); @@ -63,6 +59,8 @@ private: mbus::Message::UP newPutDocumentMessage(const string &documentId); public: + Test(); + ~Test(); int Main() override; void testAND(); void testDocumentRouteSelector(); @@ -94,6 +92,9 @@ public: TEST_APPHOOK(Test); +Test::Test() {} +Test::~Test() {} + int Test::Main() { TEST_INIT(_argv[0]); diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.cpp index f9c59f99197..01e95e9f035 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.cpp @@ -22,6 +22,8 @@ BatchDocumentUpdateMessage::BatchDocumentUpdateMessage(const string& group) setBucketId(document::GroupDocIdString("groupdoc:foo:" + _group + ":bar")); } +BatchDocumentUpdateMessage::~BatchDocumentUpdateMessage() {} + void BatchDocumentUpdateMessage::setBucketId(const document::IdString& idString) { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.h index 1a7d6b84622..311f06afe06 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/batchdocumentupdatemessage.h @@ -30,6 +30,7 @@ public: for documents belonging to the given group. */ BatchDocumentUpdateMessage(const string& group); + ~BatchDocumentUpdateMessage(); /** @return Returns a list of the updates to be performed. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.cpp index 162dbe9c7d8..19e727d44e6 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "getdocumentreply.h" #include <vespa/documentapi/messagebus/documentprotocol.h> @@ -10,6 +11,8 @@ GetDocumentReply::GetDocumentReply() : _lastModified(0) {} +GetDocumentReply::~GetDocumentReply() {} + GetDocumentReply::GetDocumentReply(document::Document::SP document) : DocumentAcceptedReply(DocumentProtocol::REPLY_GETDOCUMENT), _document(document), diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h index 6f5517176c3..5e188533197 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h @@ -22,6 +22,7 @@ public: * Constructs a new reply for deserialization. */ GetDocumentReply(); + ~GetDocumentReply(); /** * Constructs a new document get reply. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp index d84d7a5c157..36b6922de49 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp @@ -10,9 +10,7 @@ PutDocumentMessage::PutDocumentMessage() : TestAndSetMessage(), _document(), _time(0) -{ - // empty -} +{} PutDocumentMessage::PutDocumentMessage(document::Document::SP document) : TestAndSetMessage(), @@ -22,6 +20,8 @@ PutDocumentMessage::PutDocumentMessage(document::Document::SP document) : setDocument(document); } +PutDocumentMessage::~PutDocumentMessage() {} + DocumentReply::UP PutDocumentMessage::doCreateReply() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h index 4537da0fb6e..160beb5c559 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.h @@ -33,6 +33,7 @@ public: * @param document The document to put. */ PutDocumentMessage(document::Document::SP document); + ~PutDocumentMessage(); /** * Returns the document to put. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp index 88e837e331b..6ca08b23e12 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "queryresultmessage.h" namespace documentapi { @@ -13,9 +14,9 @@ QueryResultMessage::QueryResultMessage(const vdslib::SearchResult & result, cons VisitorMessage(), _searchResult(result), _summary(summary) -{ - // empty -} +{} + +QueryResultMessage::~QueryResultMessage() {} DocumentReply::UP QueryResultMessage::doCreateReply() const diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h index 8c1fad3eb8a..a7f75b55fe2 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h @@ -25,6 +25,7 @@ public: * Constructs a new search result message for deserialization. */ QueryResultMessage(); + ~QueryResultMessage(); /** * Constructs a new search result message for the given search result. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp index d8bbb95966c..448d413be9e 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "statbucketreply.h" #include <vespa/documentapi/messagebus/documentprotocol.h> @@ -7,8 +8,8 @@ namespace documentapi { StatBucketReply::StatBucketReply() : DocumentReply(DocumentProtocol::REPLY_STATBUCKET), _results() -{ - // empty -} +{} + +StatBucketReply::~StatBucketReply() {} } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h index 10ff871fc77..d67653b1074 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/statbucketreply.h @@ -11,6 +11,7 @@ private: public: StatBucketReply(); + ~StatBucketReply(); void setResults(const string& results) { _results = results; } const string& getResults() const { return _results; } string toString() const override { return "statbucketreply"; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp index bba9924b071..d252253f6d1 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "updatedocumentmessage.h" #include "updatedocumentreply.h" #include <vespa/documentapi/messagebus/documentprotocol.h> @@ -22,6 +23,8 @@ UpdateDocumentMessage::UpdateDocumentMessage(document::DocumentUpdate::SP docume setDocumentUpdate(documentUpdate); } +UpdateDocumentMessage::~UpdateDocumentMessage() {} + DocumentReply::UP UpdateDocumentMessage::doCreateReply() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h index 18c6db639d2..17a1a9d4913 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentmessage.h @@ -26,6 +26,7 @@ public: * Constructs a new document message for deserialization. */ UpdateDocumentMessage(); + ~UpdateDocumentMessage(); /** * Constructs a new document update message. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp index 784fb494c3c..1d423eff543 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp @@ -43,6 +43,8 @@ CreateVisitorMessage::CreateVisitorMessage(const string& libraryName, _maxBucketsPerVisitor(1) {} +CreateVisitorMessage::~CreateVisitorMessage() {} + DocumentReply::UP CreateVisitorMessage::doCreateReply() const { diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h index ce30be3ecc2..8a40bd05127 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h @@ -48,11 +48,11 @@ public: typedef std::unique_ptr<CreateVisitorMessage> UP; CreateVisitorMessage(); // must be deserialized into - CreateVisitorMessage(const string& libraryName, const string& instanceId, const string& controlDestination, const string& dataDestination); + ~CreateVisitorMessage(); const string& getLibraryName() const { return _libName; } void setLibraryName(const string& value) { _libName = value; } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp index bcf478cb05d..7c83fcc40e2 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.cpp @@ -15,4 +15,6 @@ WrongDistributionReply::WrongDistributionReply(const string &systemState) : _systemState(systemState) {} +WrongDistributionReply::~WrongDistributionReply() {} + } diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h index 486638ce89c..67052ec180c 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h @@ -15,6 +15,7 @@ public: WrongDistributionReply(); WrongDistributionReply(const string &systemState); + ~WrongDistributionReply(); const string &getSystemState() const { return _systemState; }; void setSystemState(const string &state) { _systemState = state; }; string toString() const override { return "wrongdistributionreply"; } diff --git a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp index 30cc674f5c3..50cf7129016 100644 --- a/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/replymerger.cpp @@ -17,6 +17,8 @@ ReplyMerger::ReplyMerger() { } +ReplyMerger::~ReplyMerger() {} + ReplyMerger::Result::Result(uint32_t successIdx, std::unique_ptr<mbus::Reply> generatedReply) : _generatedReply(std::move(generatedReply)), diff --git a/documentapi/src/vespa/documentapi/messagebus/replymerger.h b/documentapi/src/vespa/documentapi/messagebus/replymerger.h index 350e80903df..b4b7a5754df 100644 --- a/documentapi/src/vespa/documentapi/messagebus/replymerger.h +++ b/documentapi/src/vespa/documentapi/messagebus/replymerger.h @@ -1,7 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once - #include <vespa/messagebus/reply.h> namespace documentapi { @@ -43,6 +42,7 @@ private: bool resourceWasFound(const mbus::Reply& r) const; public: ReplyMerger(); + ~ReplyMerger(); void merge(uint32_t idx, const mbus::Reply&); Result mergedReply(); |