Use explicit instantiations of SingleValueNumericPostingAttribute

and SingleValueStringPostingAttributeT.

6 files changed, 18 insertions, 4 deletions

diff --git a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
index 41216b750d1..2f3684874ee 100644
--- a/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
+++ b/searchlib/src/tests/attribute/searchable/attribute_searchable_adapter_test.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/test_kit.h>
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchcommon/attribute/iattributecontext.h>
 #include <vespa/searchlib/attribute/attribute_blueprint_factory.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
@@ -25,7 +26,7 @@
 #include <vespa/searchlib/queryeval/field_spec.h>
 #include <vespa/searchlib/queryeval/searchiterator.h>
 #include <vespa/searchlib/queryeval/wand/parallel_weak_and_search.h>
-#include <vespa/searchlib/attribute/singlenumericpostattribute.hpp>
+#include <vespa/searchlib/attribute/singlenumericpostattribute.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP("attribute_searchable_adapter_test");
diff --git a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
index 3d4edcd4aea..a19b093ef4d 100644
--- a/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
+++ b/searchlib/src/tests/attribute/stringattribute/stringattribute_test.cpp
@@ -7,7 +7,8 @@
 #include <vespa/searchlib/attribute/multistringpostattribute.h>
 
 #include <vespa/searchlib/attribute/enumstore.hpp>
-#include <vespa/searchlib/attribute/singlestringpostattribute.hpp>
+#include <vespa/searchlib/attribute/single_string_enum_search_context.h>
+#include <vespa/searchlib/attribute/singlestringpostattribute.h>
 #include <vespa/searchlib/attribute/multistringpostattribute.hpp>
 
 #include <vespa/log/log.h>
diff --git a/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp b/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
index 05b6bb07a19..388ecda53e5 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsinglefastsearch.cpp
@@ -7,8 +7,8 @@
 #include "singlestringattribute.h"
 #include "singleboolattribute.h"
 #include <vespa/searchcommon/attribute/config.h>
-#include "singlestringpostattribute.hpp"
-#include "singlenumericpostattribute.hpp"
+#include "singlestringpostattribute.h"
+#include "singlenumericpostattribute.h"
 #include <vespa/searchlib/tensor/direct_tensor_attribute.h>
 
 #define INTPOSTING(T)   SingleValueNumericPostingAttribute< ENUM_ATTRIBUTE(IntegerAttributeTemplate<T>) >
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
index 2fa8330281b..cd46bbb5a8a 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
@@ -4,6 +4,7 @@
 
 #include "multistringpostattribute.h"
 #include "multi_string_enum_search_context.h"
+#include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchlib/query/query_term_simple.h>
 
 namespace search {
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.cpp b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.cpp
index 5279a9c6fcd..5b04cb68867 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.cpp
@@ -1,11 +1,20 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "singlenumericpostattribute.hpp"
+#include "floatbase.h"
+#include "integerbase.h"
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.attribute.single_numeric_post_attribute");
 
 namespace search {
 
+template class SingleValueNumericPostingAttribute<EnumAttribute<IntegerAttributeTemplate<int8_t>>>;
+template class SingleValueNumericPostingAttribute<EnumAttribute<IntegerAttributeTemplate<int16_t>>>;
+template class SingleValueNumericPostingAttribute<EnumAttribute<IntegerAttributeTemplate<int32_t>>>;
+template class SingleValueNumericPostingAttribute<EnumAttribute<IntegerAttributeTemplate<int64_t>>>;
+template class SingleValueNumericPostingAttribute<EnumAttribute<FloatingPointAttributeTemplate<float>>>;
+template class SingleValueNumericPostingAttribute<EnumAttribute<FloatingPointAttributeTemplate<double>>>;
+
 } // namespace search
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.cpp b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.cpp
index ecaeedca17b..6a3992606f3 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.cpp
@@ -4,5 +4,7 @@
 
 namespace search {
 
+template class SingleValueStringPostingAttributeT<EnumAttribute<StringAttribute>>;
+
 } // namespace search