Use explicit instantiations of UniqueStore.

2 files changed, 16 insertions, 1 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
index d7d627ff2bc..571a5bb1ce5 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstore.cpp
@@ -88,3 +88,19 @@ template class EnumStoreT<float>;
 template class EnumStoreT<double>;
 
 } // namespace search
+
+namespace vespalib::datastore {
+
+using search::EnumStoreComparator;
+using search::EnumStoreStringComparator;
+using search::enumstore::InternalIndex;
+
+template class UniqueStore<const char*, InternalIndex, EnumStoreStringComparator, UniqueStoreStringAllocator<InternalIndex>>;
+template class UniqueStore<int8_t, InternalIndex, EnumStoreComparator<int8_t>>;
+template class UniqueStore<int16_t, InternalIndex, EnumStoreComparator<int16_t>>;
+template class UniqueStore<int32_t, InternalIndex, EnumStoreComparator<int32_t>>;
+template class UniqueStore<int64_t, InternalIndex, EnumStoreComparator<int64_t>>;
+template class UniqueStore<float, InternalIndex, EnumStoreComparator<float>>;
+template class UniqueStore<double, InternalIndex, EnumStoreComparator<double>>;
+
+}
diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.cpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.cpp
index 96a5f3ef506..dda48269b89 100644
--- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.cpp
@@ -6,7 +6,6 @@
 #include "floatbase.h"
 #include "integerbase.h"
 #include "stringbase.h"
-#include <vespa/vespalib/datastore/unique_store.hpp>
 #include <vespa/vespalib/datastore/unique_store_remapper.hpp>
 #include <stdexcept>