Use a templated helper method to get proper inlining by allowing the correct type

to be known at the right place.

1 files changed, 5 insertions, 3 deletions

diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h
index be6b8d213d8..f75bf8699c8 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h
+++ b/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h
@@ -52,15 +52,17 @@ public:
 
     int32_t find(DocId docId, int32_t elementId, int32_t &weight) const { return onFind(docId, elementId, weight); }
     int32_t find(DocId docId, int32_t elementId) const { return onFind(docId, elementId); }
-    bool matches(DocId docId, int32_t &weight) const {
+    template<typename SC>
+    static bool matches(const SC & sc, DocId docId, int32_t &weight) {
         weight = 0;
         int32_t oneWeight(0);
-        int32_t firstId = find(docId, 0, oneWeight);
-        for (int32_t id(firstId); id >= 0; id = find(docId, id + 1, oneWeight)) {
+        int32_t firstId = sc.find(docId, 0, oneWeight);
+        for (int32_t id(firstId); id >= 0; id = sc.find(docId, id + 1, oneWeight)) {
             weight += oneWeight;
         }
         return firstId >= 0;
     }
+    bool matches(DocId docId, int32_t &weight) const { return matches(*this, docId, weight); }
     bool matches(DocId doc) const { return find(doc, 0) >= 0; }
 
 };