diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-02 15:40:36 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:44 +0100 |
| commit | f2fd8d33d46edb8b3c4351d14f4abbc386ffbabf (patch) | |
| tree | 087f1b61806834edd4349fb52ba69c5b1dd34756 /storageapi | |
| parent | f97313b7611fc90f87c656c61c97ff2baa0b22a7 (diff) | |
Include asciistream in implementation only.
Diffstat (limited to 'storageapi')
3 files changed, 19 insertions, 18 deletions
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp index 1cbe0d09071..1ad07387ba4 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization.cpp @@ -1,9 +1,10 @@ // 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/mbusprot/protocolserialization4_2.h> +#include "protocolserialization4_2.h" +#include "serializationhelper.h" +#include "storagecommand.h" +#include "storagereply.h" -#include <vespa/log/log.h> #include <vespa/storageapi/messageapi/storagemessage.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/bucketsplitting.h> @@ -11,11 +12,11 @@ #include <vespa/storageapi/message/multioperation.h> #include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/removelocation.h> -#include <vespa/storageapi/mbusprot/serializationhelper.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> -#include <vespa/storageapi/mbusprot/storagereply.h> +#include <vespa/vespalib/util/exceptions.h> + #include <vespa/vespalib/util/growablebytebuffer.h> +#include <vespa/log/log.h> LOG_SETUP(".storage.api.mbusprot.serialization.base"); namespace storage { diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp index 4965a6d7df9..c79d6dc1073 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization4_2.cpp @@ -1,9 +1,12 @@ // 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/mbusprot/protocolserialization4_2.h> +#include "protocolserialization4_2.h" +#include "oldreturncodemapper.h" +#include "serializationhelper.h" +#include "storagecommand.h" +#include "storagereply.h" +#include "storageprotocol.h" -#include <vespa/log/log.h> #include <vespa/messagebus/blob.h> #include <vespa/messagebus/blobref.h> #include <vespa/storageapi/messageapi/storagemessage.h> @@ -12,14 +15,11 @@ #include <vespa/storageapi/message/persistence.h> #include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/multioperation.h> -#include <vespa/storageapi/mbusprot/oldreturncodemapper.h> -#include <vespa/storageapi/mbusprot/serializationhelper.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> -#include <vespa/storageapi/mbusprot/storagereply.h> -#include <vespa/storageapi/mbusprot/storageprotocol.h> + #include <vespa/storageapi/message/removelocation.h> #include <vespa/vespalib/util/growablebytebuffer.h> - +#include <vespa/vespalib/util/exceptions.h> +#include <vespa/log/log.h> LOG_SETUP(".storage.api.mbusprot.serialization.4_2"); namespace storage { diff --git a/storageapi/src/vespa/storageapi/mbusprot/storagereply.cpp b/storageapi/src/vespa/storageapi/mbusprot/storagereply.cpp index f91893ea355..a655319b9db 100644 --- a/storageapi/src/vespa/storageapi/mbusprot/storagereply.cpp +++ b/storageapi/src/vespa/storageapi/mbusprot/storagereply.cpp @@ -1,8 +1,8 @@ // 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/mbusprot/storagereply.h> -#include <vespa/storageapi/mbusprot/storagecommand.h> +#include "storagereply.h" +#include "storagecommand.h" +#include <vespa/vespalib/util/exceptions.h> using vespalib::alloc::Alloc; using vespalib::IllegalStateException; |