From efa368961f9fe756bcf3efa000a100d2b3085bbb Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Mon, 11 Jan 2021 00:29:05 +0000
Subject: Update test and add instantiations.

---
 searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp | 8 --------
 searchlib/src/vespa/searchlib/predicate/predicate_index.cpp       | 1 +
 searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp     | 1 +
 searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp    | 1 +
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'searchlib')

diff --git a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp
index 2da4b801436..19d30317c7b 100644
--- a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp
@@ -310,11 +310,3 @@ class BTree<IEnumStore::Index, uint32_t, NoAggregated,
             const vespalib::datastore::EntryComparatorWrapper, EnumTreeTraits>;
 
 }
-
-namespace vespalib::datastore {
-
-using namespace btree;
-
-VESPALIB_DATASTORE_INSTANTIATE_BUFFERTYPE_INTERNALNODE(EntryRef, NoAggregated, BTreeDefaultTraits::INTERNAL_SLOTS);
-
-}
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp
index 42a84b4bb85..e9b1a6bd685 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp
@@ -2,6 +2,7 @@
 
 #include "predicate_index.h"
 #include "predicate_hash.h"
+#include <vespa/vespalib/datastore/buffer_type.hpp>
 #include <vespa/vespalib/btree/btree.hpp>
 #include <vespa/vespalib/btree/btreeroot.hpp>
 #include <vespa/vespalib/btree/btreeiterator.hpp>
diff --git a/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp b/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp
index ef4b711b86f..f92a3c69dc4 100644
--- a/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/streamed_value_store.cpp
@@ -6,6 +6,7 @@
 #include <vespa/eval/eval/fast_value.hpp>
 #include <vespa/eval/streamed/streamed_value_builder_factory.h>
 #include <vespa/eval/streamed/streamed_value_view.h>
+#include <vespa/vespalib/datastore/buffer_type.hpp>
 #include <vespa/vespalib/datastore/datastore.hpp>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/typify.h>
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
index 0174f1d0aac..f88304f74af 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
@@ -6,6 +6,7 @@
 #include <vespa/searchlib/memoryindex/posting_iterator.h>
 #include <vespa/searchlib/queryeval/iterators.h>
 #include <vespa/searchlib/util/postingpriorityqueue.h>
+#include <vespa/vespalib/datastore/buffer_type.hpp>
 #include <vespa/vespalib/btree/btreeiterator.hpp>
 #include <vespa/vespalib/btree/btreenode.hpp>
 #include <vespa/vespalib/btree/btreenodeallocator.hpp>
-- 
cgit v1.2.3