Adjust explicit instantiations of BufferType and Array.

4 files changed, 11 insertions, 9 deletions

diff --git a/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp b/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp
index 9f98ba05493..17a32d45b69 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp
@@ -52,9 +52,4 @@ VESPALIB_DATASTORE_INSTANTIATE_BUFFERTYPE_LEAFNODE(EntryRef, EntryRef, NoAggrega
 VESPALIB_DATASTORE_INSTANTIATE_BUFFERTYPE_LEAFNODE(uint32_t, EntryRef, NoAggregated, BTreeDefaultTraits::LEAF_SLOTS);
 VESPALIB_DATASTORE_INSTANTIATE_BUFFERTYPE_LEAFNODE(uint64_t, EntryRef, NoAggregated, BTreeDefaultTraits::LEAF_SLOTS);
 
-template class BufferType<BTreeKeyData<uint32_t, uint32_t>>;
-template class BufferType<BTreeKeyData<uint32_t, int32_t>>;
-template class BufferType<BTreeKeyData<uint32_t, BTreeNoLeafData>>;
-template class BufferType<BTreeKeyData<uint32_t, EntryRef>>;
-
 }
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodestore.h b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
index 73e68c3579f..c59092bf75c 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
@@ -248,8 +248,4 @@ extern template class BufferType<BTreeLeafNode<uint32_t, BTreeNoLeafData, NoAggr
 extern template class BufferType<BTreeLeafNode<uint32_t, int32_t, MinMaxAggregated, BTreeDefaultTraits::LEAF_SLOTS>,
                                  FrozenBtreeNode<BTreeLeafNode<uint32_t, int32_t, MinMaxAggregated, BTreeDefaultTraits::LEAF_SLOTS>>>;
 
-extern template class BufferType<BTreeKeyData<uint32_t, uint32_t>>;
-extern template class BufferType<BTreeKeyData<uint32_t, int32_t>>;
-extern template class BufferType<BTreeKeyData<uint32_t, BTreeNoLeafData>>;
-
 }
diff --git a/vespalib/src/vespa/vespalib/btree/btreestore.cpp b/vespalib/src/vespa/vespalib/btree/btreestore.cpp
index 14f34d0ba50..992612070a0 100644
--- a/vespalib/src/vespa/vespalib/btree/btreestore.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreestore.cpp
@@ -4,6 +4,8 @@
 #include "btreeiterator.hpp"
 #include <vespa/vespalib/datastore/buffer_type.hpp>
 
+using vespalib::datastore::EntryRef;
+
 namespace vespalib::btree {
 
 template class BTreeStore<uint32_t, uint32_t, NoAggregated, std::less<uint32_t>, BTreeDefaultTraits>;
@@ -20,4 +22,9 @@ template class BufferType<BTreeRoot<uint32_t, uint32_t, NoAggregated, std::less<
 template class BufferType<BTreeRoot<uint32_t, BTreeNoLeafData, NoAggregated, std::less<uint32_t>, BTreeDefaultTraits>>;
 template class BufferType<BTreeRoot<uint32_t, int32_t, MinMaxAggregated, std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>>;
 
+template class BufferType<BTreeKeyData<uint32_t, uint32_t>>;
+template class BufferType<BTreeKeyData<uint32_t, int32_t>>;
+template class BufferType<BTreeKeyData<uint32_t, BTreeNoLeafData>>;
+template class BufferType<BTreeKeyData<uint32_t, EntryRef>>;
+
 }
diff --git a/vespalib/src/vespa/vespalib/btree/btreestore.h b/vespalib/src/vespa/vespalib/btree/btreestore.h
index 9d98a9ca514..9fdade850f1 100644
--- a/vespalib/src/vespa/vespalib/btree/btreestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreestore.h
@@ -382,4 +382,8 @@ extern template class BufferType<BTreeRoot<uint32_t, uint32_t, NoAggregated, std
 extern template class BufferType<BTreeRoot<uint32_t, BTreeNoLeafData, NoAggregated, std::less<uint32_t>, BTreeDefaultTraits>>;
 extern template class BufferType<BTreeRoot<uint32_t, int32_t, MinMaxAggregated, std::less<uint32_t>, BTreeDefaultTraits, MinMaxAggrCalc>>;
 
+extern template class BufferType<BTreeKeyData<uint32_t, uint32_t>>;
+extern template class BufferType<BTreeKeyData<uint32_t, int32_t>>;
+extern template class BufferType<BTreeKeyData<uint32_t, BTreeNoLeafData>>;
+
 }