introduce separate docsum matcher class

2 files changed, 4 insertions, 5 deletions

diff --git a/searchlib/src/vespa/searchlib/common/featureset.h b/searchlib/src/vespa/searchlib/common/featureset.h
index 1ec662685a7..beb9bd909ee 100644
--- a/searchlib/src/vespa/searchlib/common/featureset.h
+++ b/searchlib/src/vespa/searchlib/common/featureset.h
@@ -50,11 +50,8 @@ private:
     FeatureSet & operator=(const FeatureSet &);
 
 public:
-    /**
-     * Convenience typedef for a shared pointer to an object of this
-     * class.
-     **/
-    typedef std::shared_ptr<FeatureSet> SP;
+    using SP = std::shared_ptr<FeatureSet>;
+    using UP = std::unique_ptr<FeatureSet>;
 
     /**
      * Create a new object without any feature information.
diff --git a/searchlib/src/vespa/searchlib/common/matching_elements.h b/searchlib/src/vespa/searchlib/common/matching_elements.h
index 9299191e83a..b31b258ea4c 100644
--- a/searchlib/src/vespa/searchlib/common/matching_elements.h
+++ b/searchlib/src/vespa/searchlib/common/matching_elements.h
@@ -24,6 +24,8 @@ public:
     MatchingElements();
     ~MatchingElements();
 
+    using UP = std::unique_ptr<MatchingElements>;
+
     void add_matching_elements(uint32_t docid, const vespalib::string &struct_field_name, const std::vector<uint32_t> &elements);
     const std::vector<uint32_t> &get_matching_elements(uint32_t docid, const vespalib::string &struct_field_name) const;
 };