Merge pull request #32483 from vespa-engine/toregge/avoid-mismatched-…

…tags-for-proton-term-nodes Avoid mismatched tags for proton term nodes.
vespa-engine · Sep 27, 2024 · 52b626e · 52b626e
2 parents a6d687e + 12ce80d
commit 52b626e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp b/searchcore/src/vespa/searchcore/proton/matching/querynodes.cpp
@@ -119,21 +119,21 @@ ProtonTermData::FieldEntry::getHandle(MatchDataDetails requested_details) const
     return handle;
 }
 
-template class ProtonTerm<search::query::LocationTerm>;
-template class ProtonTerm<search::query::NumberTerm>;
-template class ProtonTerm<search::query::Phrase>;
-template class ProtonTerm<search::query::PrefixTerm>;
-template class ProtonTerm<search::query::RangeTerm>;
-template class ProtonTerm<search::query::StringTerm>;
-template class ProtonTerm<search::query::SubstringTerm>;
-template class ProtonTerm<search::query::SuffixTerm>;
-template class ProtonTerm<search::query::WeightedSetTerm>;
-template class ProtonTerm<search::query::DotProduct>;
-template class ProtonTerm<search::query::WandTerm>;
-template class ProtonTerm<search::query::PredicateQuery>;
-template class ProtonTerm<search::query::RegExpTerm>;
-template class ProtonTerm<search::query::FuzzyTerm>;
-template class ProtonTerm<search::query::InTerm>;
+template struct ProtonTerm<search::query::LocationTerm>;
+template struct ProtonTerm<search::query::NumberTerm>;
+template struct ProtonTerm<search::query::Phrase>;
+template struct ProtonTerm<search::query::PrefixTerm>;
+template struct ProtonTerm<search::query::RangeTerm>;
+template struct ProtonTerm<search::query::StringTerm>;
+template struct ProtonTerm<search::query::SubstringTerm>;
+template struct ProtonTerm<search::query::SuffixTerm>;
+template struct ProtonTerm<search::query::WeightedSetTerm>;
+template struct ProtonTerm<search::query::DotProduct>;
+template struct ProtonTerm<search::query::WandTerm>;
+template struct ProtonTerm<search::query::PredicateQuery>;
+template struct ProtonTerm<search::query::RegExpTerm>;
+template struct ProtonTerm<search::query::FuzzyTerm>;
+template struct ProtonTerm<search::query::InTerm>;
 
 ProtonEquiv::~ProtonEquiv() = default;
 ProtonSameElement::~ProtonSameElement() = default;

diff --git a/searchcore/src/vespa/searchcore/proton/matching/querynodes.h b/searchcore/src/vespa/searchcore/proton/matching/querynodes.h
@@ -184,20 +184,20 @@ struct ProtonNodeTypes {
     using InTerm =              ProtonInTerm;
 };
 
-extern template class ProtonTerm<search::query::LocationTerm>;
-extern template class ProtonTerm<search::query::NumberTerm>;
-extern template class ProtonTerm<search::query::Phrase>;
-extern template class ProtonTerm<search::query::PrefixTerm>;
-extern template class ProtonTerm<search::query::RangeTerm>;
-extern template class ProtonTerm<search::query::StringTerm>;
-extern template class ProtonTerm<search::query::SubstringTerm>;
-extern template class ProtonTerm<search::query::SuffixTerm>;
-extern template class ProtonTerm<search::query::WeightedSetTerm>;
-extern template class ProtonTerm<search::query::DotProduct>;
-extern template class ProtonTerm<search::query::WandTerm>;
-extern template class ProtonTerm<search::query::PredicateQuery>;
-extern template class ProtonTerm<search::query::RegExpTerm>;
-extern template class ProtonTerm<search::query::FuzzyTerm>;
-extern template class ProtonTerm<search::query::InTerm>;
+extern template struct ProtonTerm<search::query::LocationTerm>;
+extern template struct ProtonTerm<search::query::NumberTerm>;
+extern template struct ProtonTerm<search::query::Phrase>;
+extern template struct ProtonTerm<search::query::PrefixTerm>;
+extern template struct ProtonTerm<search::query::RangeTerm>;
+extern template struct ProtonTerm<search::query::StringTerm>;
+extern template struct ProtonTerm<search::query::SubstringTerm>;
+extern template struct ProtonTerm<search::query::SuffixTerm>;
+extern template struct ProtonTerm<search::query::WeightedSetTerm>;
+extern template struct ProtonTerm<search::query::DotProduct>;
+extern template struct ProtonTerm<search::query::WandTerm>;
+extern template struct ProtonTerm<search::query::PredicateQuery>;
+extern template struct ProtonTerm<search::query::RegExpTerm>;
+extern template struct ProtonTerm<search::query::FuzzyTerm>;
+extern template struct ProtonTerm<search::query::InTerm>;
 
 }