More robust template instantiation in searchlib.

3 files changed, 6 insertions, 3 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp
index 20c66993486..2d991c7d565 100644
--- a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp
@@ -636,6 +636,6 @@ namespace attribute {
 
 }
 
-template class vespalib::hash_map<search::EnumStoreIndex, search::EnumStoreIndex,
-                                  vespalib::hash<search::EnumStoreIndex>, std::equal_to<search::EnumStoreIndex>,
-                                  vespalib::hashtable_base::and_modulator>;
+VESPALIB_HASH_MAP_INSTANTIATE_H_E_M(search::EnumStoreIndex, search::EnumStoreIndex,
+                                    vespalib::hash<search::EnumStoreIndex>, std::equal_to<search::EnumStoreIndex>,
+                                    vespalib::hashtable_base::and_modulator);
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
index 38d9160de2a..6c0d9342f39 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "multistringattribute.h"
+#include "multistringattribute.hpp"
 #include <vespa/searchlib/query/queryterm.h>
 
 namespace search {
diff --git a/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp b/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
index 3bb1481969a..fe6da8a4cf0 100644
--- a/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/storebybucket.cpp
@@ -85,3 +85,5 @@ StoreByBucket::drain(IWrite & drainer)
 }
 
 }
+
+VESPALIB_HASH_MAP_INSTANTIATE(uint64_t, vespalib::ConstBufferRef);