aboutsummaryrefslogtreecommitdiffstats
path: root/storage/src/tests/storageserver/testvisitormessagesession.h
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-05-02 14:42:00 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2017-05-02 14:42:00 +0200
commitc0518dde43775f24955612ab46398a1c21f3ff50 (patch)
tree7e0482a7db41e4cf407c53b07aa516760c63d9af /storage/src/tests/storageserver/testvisitormessagesession.h
parent0f646f10b377b90fc37e9911f9fe383d112ff157 (diff)
Fix warnings hidden earlier due to including application headers as system includes
Diffstat (limited to 'storage/src/tests/storageserver/testvisitormessagesession.h')
-rw-r--r--storage/src/tests/storageserver/testvisitormessagesession.h24
1 files changed, 7 insertions, 17 deletions
diff --git a/storage/src/tests/storageserver/testvisitormessagesession.h b/storage/src/tests/storageserver/testvisitormessagesession.h
index 9b2f645905d..9ebebf73bea 100644
--- a/storage/src/tests/storageserver/testvisitormessagesession.h
+++ b/storage/src/tests/storageserver/testvisitormessagesession.h
@@ -2,11 +2,11 @@
#pragma once
-#include <deque>
#include <vespa/storage/visiting/visitormessagesession.h>
#include <vespa/storage/visiting/visitorthread.h>
#include <vespa/documentapi/messagebus/messages/documentmessage.h>
#include <vespa/storage/storageserver/priorityconverter.h>
+#include <deque>
namespace storage {
@@ -34,13 +34,9 @@ public:
bool autoReply);
void reply(mbus::Reply::UP rep);
-
- uint32_t pending() { return pendingCount; }
-
- mbus::Result send(std::unique_ptr<documentapi::DocumentMessage> message);
-
+ uint32_t pending() override { return pendingCount; }
+ mbus::Result send(std::unique_ptr<documentapi::DocumentMessage> message) override;
void waitForMessages(unsigned int msgCount);
-
vespalib::Monitor& getMonitor() { return _waitMonitor; }
};
@@ -56,24 +52,18 @@ struct TestVisitorMessageSessionFactory : public VisitorMessageSessionFactory
: _createAutoReplyVisitorSessions(false),
_priConverter(configId) {}
- VisitorMessageSession::UP createSession(Visitor& v, VisitorThread& vt) {
+ VisitorMessageSession::UP createSession(Visitor& v, VisitorThread& vt) override {
vespalib::LockGuard lock(_accessLock);
- TestVisitorMessageSession::UP session(
- new TestVisitorMessageSession(
- vt,
- v,
- _autoReplyError,
- _createAutoReplyVisitorSessions));
+ TestVisitorMessageSession::UP session(new TestVisitorMessageSession(vt, v, _autoReplyError,
+ _createAutoReplyVisitorSessions));
_visitorSessions.push_back(session.get());
return VisitorMessageSession::UP(std::move(session));
}
- documentapi::Priority::Value toDocumentPriority(uint8_t storagePriority) const
- {
+ documentapi::Priority::Value toDocumentPriority(uint8_t storagePriority) const override {
return _priConverter.toDocumentPriority(storagePriority);
}
};
} // storage
-