diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-03-24 16:50:32 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-03-24 16:50:32 +0100 |
commit | 7fa6c5dde45b61787b6c61d745288e28c66d347f (patch) | |
tree | d855559addc37dda5f5daf8cd619e22d50a81942 | |
parent | bdf8b72f4ac27ce4199034f79c0f70b10b7590a3 (diff) |
Adjust explicit instantiations of BufferType and Array.
5 files changed, 18 insertions, 9 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/postingchange.cpp b/searchlib/src/vespa/searchlib/attribute/postingchange.cpp index 0ce0c50f718..a49a17470d7 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingchange.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postingchange.cpp @@ -350,3 +350,10 @@ template WeightedPostingChangeMap PostingChangeComputerT<ValueIndex, WeightedPos const EnumIndexMapper &); } + +namespace vespalib { + +template class Array<search::AttributePosting>; +template class Array<search::AttributeWeightPosting>; + +} 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>>; + } |