diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-24 14:14:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 14:14:10 +0100 |
| commit | 7b9862f76bd05e926fdbb44bae078302ecca3ce7 (patch) | |
| tree | 59fcdfdde41ed21a83d36bd800745b06e0d689ed | |
| parent | 72c83e118e09f73ef8cd7b97c7c0ac63b9ba5ca1 (diff) | |
| parent | dbd9e374afd1a757bd1ca71f95c9457ffcf262e5 (diff) | |
Merge pull request #26575 from vespa-engine/toregge/use-explicit-instantiations-of-multi-value-string-attribute
Use explicit instantiation of MultiValueStringAttributeT
4 files changed, 3 insertions, 3 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp index a73d9f1f08c..d372bf759a3 100644 --- a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp @@ -4,7 +4,7 @@ #include "defines.h" #include "attributevector.hpp" #include "multinumericattribute.h" -#include "multistringattribute.hpp" +#include "multistringattribute.h" #include <vespa/log/log.h> LOG_SETUP(".searchlib.attribute.create_array_std"); diff --git a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp index 34bb81e4305..f70fef3a9fb 100644 --- a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp +++ b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp @@ -4,7 +4,7 @@ #include "defines.h" #include "attributevector.hpp" #include "multinumericattribute.h" -#include "multistringattribute.hpp" +#include "multistringattribute.h" #include <vespa/log/log.h> LOG_SETUP(".searchlib.attribute.create_set_std"); diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp index 1c1ad909da6..2fa8330281b 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp @@ -3,7 +3,6 @@ #pragma once #include "multistringpostattribute.h" -#include "multistringattribute.hpp" #include "multi_string_enum_search_context.h" #include <vespa/searchlib/query/query_term_simple.h> diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h index 2a83d22929a..d0a8958f615 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h @@ -9,6 +9,7 @@ #include "posting_list_merger.h" #include <vespa/searchcommon/attribute/search_context_params.h> #include <vespa/searchcommon/common/range.h> +#include <vespa/searchlib/query/query_term_ucs4.h> #include <vespa/vespalib/util/regexp.h> #include <vespa/vespalib/fuzzy/fuzzy_matcher.h> #include <regex> |