diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-03-16 22:33:33 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-03-19 10:01:07 +0100 |
| commit | 3eb15d2eabb0b170c96de7241aa2eed7d5d27879 (patch) | |
| tree | ff363b717ba0f591904a55388b5e09683c1f7165 /documentapi/src | |
| parent | 9335569e415a04beaab3ebcb62e02faf37be7ad3 (diff) | |
Remove DocumentList with children...
Conflicts:
storage/src/tests/persistence/filestorage/filestormanagertest.cpp
Resolve merge conflict.
Diffstat (limited to 'documentapi/src')
| -rw-r--r-- | documentapi/src/tests/messages/messages50test.cpp | 1 | ||||
| -rw-r--r-- | documentapi/src/tests/policies/policies_test.cpp | 1 | ||||
| -rw-r--r-- | documentapi/src/vespa/documentapi/messagebus/messages/visitor.h | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/documentapi/src/tests/messages/messages50test.cpp b/documentapi/src/tests/messages/messages50test.cpp index db82bdce54d..161f976c3d5 100644 --- a/documentapi/src/tests/messages/messages50test.cpp +++ b/documentapi/src/tests/messages/messages50test.cpp @@ -6,7 +6,6 @@ #include <vespa/document/select/parser.h> #include <vespa/document/update/fieldpathupdates.h> #include <vespa/documentapi/documentapi.h> -#include <vespa/vdslib/container/writabledocumentlist.h> using document::DataType; using document::DocumentTypeRepo; diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index bffbefb6ff1..f32e253c5a9 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -17,7 +17,6 @@ #include <vespa/messagebus/routing/routingtable.h> #include <vespa/messagebus/routing/policydirective.h> #include <vespa/messagebus/testlib/testserver.h> -#include <vespa/vdslib/container/mutabledocumentlist.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/document/base/testdocrepo.h> #include <vespa/document/fieldvalue/longfieldvalue.h> diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h index 4ba6b1b437b..80b13bc2b9d 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h @@ -6,11 +6,12 @@ #include "documentmessage.h" #include "documentreply.h" #include <vespa/vdslib/container/parameters.h> -#include <vespa/vdslib/container/documentlist.h> #include <vespa/vdslib/container/visitorstatistics.h> #include <vespa/document/bucket/bucketid.h> #include <vespa/documentapi/messagebus/documentprotocol.h> #include <vespa/document/select/orderingspecification.h> +#include <vespa/document/fieldvalue/document.h> + namespace documentapi { |