diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-14 19:27:53 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-15 15:51:29 +0100 |
commit | f31939f3c6ca328917c6316440386c0ac6b91fc4 (patch) | |
tree | 4db15cac33cd341d66ffe4126fe7e1af2e23437f /vsm | |
parent | f97f1f8d65c53128a98a497a8e3299d6b4abc41f (diff) |
C++11 for loops and include canonize.
Diffstat (limited to 'vsm')
-rw-r--r-- | vsm/src/vespa/vsm/common/storagedocument.cpp | 1 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/common/storagedocument.h | 2 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfilter.cpp | 3 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp | 5 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/slimefieldwriter.h | 8 |
5 files changed, 10 insertions, 9 deletions
diff --git a/vsm/src/vespa/vsm/common/storagedocument.cpp b/vsm/src/vespa/vsm/common/storagedocument.cpp index 1cb636a80c7..83eae8a2403 100644 --- a/vsm/src/vespa/vsm/common/storagedocument.cpp +++ b/vsm/src/vespa/vsm/common/storagedocument.cpp @@ -1,4 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include "storagedocument.h" #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/weightedsetfieldvalue.h> diff --git a/vsm/src/vespa/vsm/common/storagedocument.h b/vsm/src/vespa/vsm/common/storagedocument.h index 3c1f2ddc375..f5b9caab509 100644 --- a/vsm/src/vespa/vsm/common/storagedocument.h +++ b/vsm/src/vespa/vsm/common/storagedocument.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once +#include "document.h" #include <vespa/document/fieldvalue/document.h> -#include <vespa/vsm/common/document.h> namespace vsm { diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp index e858c8ca8a6..edf737c09cf 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp @@ -2,10 +2,9 @@ #include "docsumfilter.h" #include "slimefieldwriter.h" -#include <vespa/searchsummary/docsummary/resultclass.h> #include <vespa/searchsummary/docsummary/summaryfieldconverter.h> -#include <vespa/document/fieldvalue/literalfieldvalue.h> #include <vespa/document/base/exceptions.h> + #include <vespa/log/log.h> LOG_SETUP(".vsm.docsumfilter"); diff --git a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp b/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp index a0abf8b7a07..9270c54b52f 100644 --- a/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp +++ b/vsm/src/vespa/vsm/vsm/slimefieldwriter.cpp @@ -1,9 +1,6 @@ // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "slimefieldwriter.h" -#include <vespa/vespalib/data/slime/slime.h> -#include <vespa/vespalib/data/slime/convenience.h> -#include <vespa/vespalib/data/slime/binary_format.h> #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h> #include <vespa/vespalib/stllike/asciistream.h> @@ -158,6 +155,8 @@ SlimeFieldWriter::SlimeFieldWriter() : { } +SlimeFieldWriter::~SlimeFieldWriter() {} + void SlimeFieldWriter::convert(const document::FieldValue & fv) { diff --git a/vsm/src/vespa/vsm/vsm/slimefieldwriter.h b/vsm/src/vespa/vsm/vsm/slimefieldwriter.h index ac540b2ccfe..c5ec03335be 100644 --- a/vsm/src/vespa/vsm/vsm/slimefieldwriter.h +++ b/vsm/src/vespa/vsm/vsm/slimefieldwriter.h @@ -1,9 +1,9 @@ // Copyright 2017 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/document/fieldvalue/fieldvalues.h> +#include "docsumfieldspec.h" #include <vespa/vsm/common/storagedocument.h> -#include <vespa/vsm/vsm/docsumfieldspec.h> +#include <vespa/document/fieldvalue/fieldvalues.h> #include <vespa/vespalib/data/slime/slime.h> #include <vespa/searchlib/util/rawbuf.h> @@ -14,7 +14,7 @@ namespace vsm { * If only a subset of the field value should be written this subset * is specified using the setInputFields() function. **/ -class SlimeFieldWriter +class SlimeFieldWriter : public document::FieldValue::IteratorHandler { private: search::RawBuf _rbuf; @@ -27,6 +27,8 @@ private: public: SlimeFieldWriter(); + ~SlimeFieldWriter(); + /** * Specifies the subset of the field value that should be written. |