- Move shared_ptr

- Refactor for readability.

2 files changed, 3 insertions, 6 deletions

diff --git a/searchlib/src/vespa/searchlib/expression/expressiontree.cpp b/searchlib/src/vespa/searchlib/expression/expressiontree.cpp
index efc9e77baf0..72a517a572e 100644
--- a/searchlib/src/vespa/searchlib/expression/expressiontree.cpp
+++ b/searchlib/src/vespa/searchlib/expression/expressiontree.cpp
@@ -21,14 +21,12 @@ ExpressionTree::Configure::execute(vespalib::Identifiable &obj) {
     e.prepare(false);
 }
 
-ExpressionTree::ExpressionTree() :
+ExpressionTree::ExpressionTree() noexcept :
     _root(),
     _attributeNodes(),
     _documentAccessorNodes(),
     _relevanceNodes()
-{
-    prepare(false);
-}
+{ }
 
 ExpressionTree::ExpressionTree(const ExpressionNode &root) :
     _root(root.clone()),
diff --git a/searchlib/src/vespa/searchlib/expression/expressiontree.h b/searchlib/src/vespa/searchlib/expression/expressiontree.h
index 7617638ff16..9f7372c4a94 100644
--- a/searchlib/src/vespa/searchlib/expression/expressiontree.h
+++ b/searchlib/src/vespa/searchlib/expression/expressiontree.h
@@ -49,7 +49,7 @@ public:
         bool check(const vespalib::Identifiable &obj) const override { return obj.inherits(ExpressionTree::classId); }
     };
 
-    ExpressionTree();
+    ExpressionTree() noexcept;
     ExpressionTree(const ExpressionNode & root);
     ExpressionTree(ExpressionNode::UP root);
     ExpressionTree(const ExpressionTree & rhs);
@@ -76,7 +76,6 @@ private:
     using AttributeNodeList = std::vector<AttributeNode *>;
     using DocumentAccessorNodeList = std::vector<DocumentAccessorNode *>;
     using RelevanceNodeList = std::vector<RelevanceNode *>;
-    using InterpolatedLookupList = std::vector<InterpolatedLookup *>;
 
     ExpressionNode::CP        _root;
     AttributeNodeList         _attributeNodes;