diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-01 17:12:26 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:43 +0100 |
commit | e2d35ebcf9378671e4dec6f6388587a00761a4ef (patch) | |
tree | e19f725179ec2c4bb3b741a731b177dd633f761f | |
parent | 4b34fcbb1fbfb1bd6089d301097a90c75fe355d5 (diff) |
Include asciistream in implementation only.
11 files changed, 23 insertions, 20 deletions
diff --git a/documentapi/src/vespa/documentapi/loadtypes/loadtype.cpp b/documentapi/src/vespa/documentapi/loadtypes/loadtype.cpp index 6cdccc6ad21..f1f14b7c8ed 100644 --- a/documentapi/src/vespa/documentapi/loadtypes/loadtype.cpp +++ b/documentapi/src/vespa/documentapi/loadtypes/loadtype.cpp @@ -1,6 +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/documentapi/loadtypes/loadtype.h> + +#include "loadtype.h" +#include <vespa/vespalib/stllike/asciistream.h> namespace documentapi { diff --git a/documentapi/src/vespa/documentapi/loadtypes/loadtype.h b/documentapi/src/vespa/documentapi/loadtypes/loadtype.h index fb00c5805b6..e7ecaa3e40c 100644 --- a/documentapi/src/vespa/documentapi/loadtypes/loadtype.h +++ b/documentapi/src/vespa/documentapi/loadtypes/loadtype.h @@ -14,9 +14,7 @@ #pragma once #include <vespa/metrics/loadmetric.h> -#include <string> #include <vespa/vespalib/util/linkedptr.h> -#include <vespa/vespalib/stllike/asciistream.h> #include <vespa/documentapi/messagebus/priority.h> namespace documentapi { diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp index 11381e5c004..fcfd8299ac1 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> #include <algorithm> #include <vespa/persistence/dummyimpl/dummypersistence.h> #include <vespa/document/select/parser.h> @@ -12,6 +10,8 @@ #include <vespa/vespalib/util/vstringfmt.h> #include <vespa/document/fieldset/fieldsetrepo.h> #include <vespa/vespalib/stllike/hash_set.h> +#include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/log/log.h> using std::binary_search; using std::lower_bound; diff --git a/persistence/src/vespa/persistence/spi/bucketinfo.cpp b/persistence/src/vespa/persistence/spi/bucketinfo.cpp index 2a535b79636..55194f427a7 100644 --- a/persistence/src/vespa/persistence/spi/bucketinfo.cpp +++ b/persistence/src/vespa/persistence/spi/bucketinfo.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/persistence/spi/bucketinfo.h> +#include "bucketinfo.h" +#include <vespa/vespalib/stllike/asciistream.h> namespace storage { namespace spi { diff --git a/persistence/src/vespa/persistence/spi/bucketinfo.h b/persistence/src/vespa/persistence/spi/bucketinfo.h index d5d2440820a..ad869c0add3 100644 --- a/persistence/src/vespa/persistence/spi/bucketinfo.h +++ b/persistence/src/vespa/persistence/spi/bucketinfo.h @@ -7,7 +7,10 @@ #pragma once #include <persistence/spi/types.h> -#include <vespa/vespalib/stllike/asciistream.h> + +namespace vespalib { + class asciistream; +} namespace storage { namespace spi { diff --git a/persistence/src/vespa/persistence/spi/result.cpp b/persistence/src/vespa/persistence/spi/result.cpp index 4734a669c6e..4d86fc01212 100644 --- a/persistence/src/vespa/persistence/spi/result.cpp +++ b/persistence/src/vespa/persistence/spi/result.cpp @@ -2,6 +2,8 @@ #include "result.h" #include <vespa/document/fieldvalue/document.h> +#include <vespa/vespalib/stllike/asciistream.h> + namespace storage { diff --git a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp index bfdf56e63bd..1c1342dc7f3 100644 --- a/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp +++ b/storageapi/src/vespa/storageapi/messageapi/storagemessage.cpp @@ -1,10 +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/messageapi/storagemessage.h> +#include "storagemessage.h" #include <vespa/vespalib/util/exceptions.h> #include <vespa/messagebus/routing/verbatimdirective.h> +#include <vespa/vespalib/stllike/asciistream.h> #include <sstream> namespace storage { diff --git a/vsm/src/tests/document/document.cpp b/vsm/src/tests/document/document.cpp index 37cccae09cc..a824d59a788 100644 --- a/vsm/src/tests/document/document.cpp +++ b/vsm/src/tests/document/document.cpp @@ -1,11 +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/log/log.h> -LOG_SETUP("document_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/vsm/common/storagedocument.h> +#include <vespa/vespalib/stllike/asciistream.h> + using namespace document; diff --git a/vsm/src/vespa/vsm/common/document.cpp b/vsm/src/vespa/vsm/common/document.cpp index 1c936330a48..b9936188cef 100644 --- a/vsm/src/vespa/vsm/common/document.cpp +++ b/vsm/src/vespa/vsm/common/document.cpp @@ -1,6 +1,6 @@ // 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/vsm/common/document.h> +#include "document.h" +#include <vespa/vespalib/stllike/asciistream.h> using search::DocumentIdT; using search::TimeT; diff --git a/vsm/src/vespa/vsm/common/document.h b/vsm/src/vespa/vsm/common/document.h index b68d4a9db26..a1c12dafbb6 100644 --- a/vsm/src/vespa/vsm/common/document.h +++ b/vsm/src/vespa/vsm/common/document.h @@ -3,7 +3,6 @@ #include <vespa/searchlib/query/base.h> #include <vespa/document/fieldvalue/fieldvalue.h> -#include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/stllike/hash_map.h> namespace vsm diff --git a/vsm/src/vespa/vsm/vsm/jsondocsumwriter.cpp b/vsm/src/vespa/vsm/vsm/jsondocsumwriter.cpp index 9f0188d8f24..e05f69d572a 100644 --- a/vsm/src/vespa/vsm/vsm/jsondocsumwriter.cpp +++ b/vsm/src/vespa/vsm/vsm/jsondocsumwriter.cpp @@ -1,10 +1,11 @@ // 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 "jsondocsumwriter.h" +#include <vespa/vespalib/stllike/asciistream.h> + #include <vespa/log/log.h> LOG_SETUP(".vsm.jsondocsumwriter"); -#include <vespa/vsm/vsm/jsondocsumwriter.h> - namespace { vespalib::string |