summaryrefslogtreecommitdiffstats
path: root/storageapi
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-12-03 01:26:33 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2016-12-12 02:55:45 +0100
commit86b600a7e6d0153f8e22a1ea468a72215d0c36a1 (patch)
tree67ebc65cf7c7a8f6a1a3f98bf18370d4afd9cad2 /storageapi
parentcb9906475a5dd328682bcd7463eba6768036c04f (diff)
Avoid building all the document code in every file.
Diffstat (limited to 'storageapi')
-rw-r--r--storageapi/src/vespa/storageapi/message/datagram.h5
-rw-r--r--storageapi/src/vespa/storageapi/message/multioperation.cpp4
-rw-r--r--storageapi/src/vespa/storageapi/message/persistence.h7
3 files changed, 8 insertions, 8 deletions
diff --git a/storageapi/src/vespa/storageapi/message/datagram.h b/storageapi/src/vespa/storageapi/message/datagram.h
index 0af2cbd3724..415c7c97908 100644
--- a/storageapi/src/vespa/storageapi/message/datagram.h
+++ b/storageapi/src/vespa/storageapi/message/datagram.h
@@ -1,7 +1,7 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
-#include <vespa/document/document.h>
+#include <vespa/document/bucket/bucketid.h>
#include <vespa/vdslib/container/documentlist.h>
#include <vespa/storageapi/messageapi/storagecommand.h>
#include <vespa/storageapi/messageapi/storagereply.h>
@@ -130,8 +130,7 @@ public:
: _doc(doc),
_lastModified(lastModified),
_removeEntry(removeEntry)
- {
- }
+ { }
};
private:
diff --git a/storageapi/src/vespa/storageapi/message/multioperation.cpp b/storageapi/src/vespa/storageapi/message/multioperation.cpp
index 35e4075e3ab..ff4702d7e4c 100644
--- a/storageapi/src/vespa/storageapi/message/multioperation.cpp
+++ b/storageapi/src/vespa/storageapi/message/multioperation.cpp
@@ -1,7 +1,7 @@
// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/storageapi/message/multioperation.h>
+#include "multioperation.h"
+#include <vespa/document/update/documentupdate.h>
using document::DocumentTypeRepo;
diff --git a/storageapi/src/vespa/storageapi/message/persistence.h b/storageapi/src/vespa/storageapi/message/persistence.h
index 12d371bf561..acccb3f9deb 100644
--- a/storageapi/src/vespa/storageapi/message/persistence.h
+++ b/storageapi/src/vespa/storageapi/message/persistence.h
@@ -6,7 +6,9 @@
*/
#pragma once
-#include <vespa/document/document.h>
+#include <vespa/document/base/documentid.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
#include <vespa/storageapi/messageapi/bucketinforeply.h>
#include <vespa/storageapi/defs.h>
#include <vespa/documentapi/messagebus/messages/testandsetcondition.h>
@@ -20,8 +22,7 @@ class TestAndSetCommand : public BucketInfoCommand {
TestAndSetCondition _condition;
public:
- TestAndSetCommand(const MessageType & messageType,
- const document::BucketId & id)
+ TestAndSetCommand(const MessageType & messageType, const document::BucketId & id)
: BucketInfoCommand(messageType, id) {}
void setCondition(const TestAndSetCondition & condition) { _condition = condition; }