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 /vsm | |
| parent | 4b34fcbb1fbfb1bd6089d301097a90c75fe355d5 (diff) | |
Include asciistream in implementation only.
Diffstat (limited to 'vsm')
| -rw-r--r-- | vsm/src/tests/document/document.cpp | 5 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/common/document.cpp | 4 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/common/document.h | 1 | ||||
| -rw-r--r-- | vsm/src/vespa/vsm/vsm/jsondocsumwriter.cpp | 7 |
4 files changed, 8 insertions, 9 deletions
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 |