Merge pull request #16834 from vespa-engine/balder/use-make-shared

Use std::make_shared

4 files changed, 10 insertions, 12 deletions

diff --git a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
index 62b598d730b..45cffde8a8c 100644
--- a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
+++ b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
@@ -91,7 +91,7 @@ AggregationResult::Configure::execute(vespalib::Identifiable &obj)
 AggregationResult &
 AggregationResult::setExpression(ExpressionNode::UP expr)
 {
-    _expressionTree.reset(new ExpressionTree(std::move(expr)));
+    _expressionTree = std::make_shared<ExpressionTree>(std::move(expr));
     prepare(&_expressionTree->getResult(), false);
     return *this;
 }
diff --git a/searchlib/src/vespa/searchlib/aggregation/group.h b/searchlib/src/vespa/searchlib/aggregation/group.h
index f6b6bc732af..5b425de24e6 100644
--- a/searchlib/src/vespa/searchlib/aggregation/group.h
+++ b/searchlib/src/vespa/searchlib/aggregation/group.h
@@ -170,8 +170,8 @@ public:
     Group();
     Group(const Group & rhs);
     Group & operator =(const Group & rhs);
-    Group(Group &&) = default;
-    Group & operator = (Group &&) = default;
+    Group(Group &&) noexcept = default;
+    Group & operator = (Group &&) noexcept = default;
     ~Group();
 
     int cmpId(const Group &rhs) const { return _id->cmpFast(*rhs._id); }
diff --git a/searchlib/src/vespa/searchlib/aggregation/groupinglevel.h b/searchlib/src/vespa/searchlib/aggregation/groupinglevel.h
index 16d004f807d..ad53ff20fc2 100644
--- a/searchlib/src/vespa/searchlib/aggregation/groupinglevel.h
+++ b/searchlib/src/vespa/searchlib/aggregation/groupinglevel.h
@@ -77,8 +77,8 @@ private:
     vespalib::CloneablePtr<Grouper>    _grouper;
 public:
     GroupingLevel();
-    GroupingLevel(GroupingLevel &&) = default;
-    GroupingLevel & operator =(GroupingLevel &&) = default;
+    GroupingLevel(GroupingLevel &&) noexcept = default;
+    GroupingLevel & operator =(GroupingLevel &&) noexcept = default;
     GroupingLevel(const GroupingLevel &);
     GroupingLevel & operator =(const GroupingLevel &);
     ~GroupingLevel();
diff --git a/searchlib/src/vespa/searchlib/expression/expressiontree.h b/searchlib/src/vespa/searchlib/expression/expressiontree.h
index 89ab4de879b..057a7801637 100644
--- a/searchlib/src/vespa/searchlib/expression/expressiontree.h
+++ b/searchlib/src/vespa/searchlib/expression/expressiontree.h
@@ -10,11 +10,10 @@ namespace document {
     class DocumentType;
     class Document;
 }
-namespace search {
 
-namespace attribute { class IAttributeContext; }
+namespace search::attribute { class IAttributeContext; }
 
-namespace expression {
+namespace search::expression {
 
 class AttributeNode;
 class DocumentAccessorNode;
@@ -45,11 +44,11 @@ public:
     ExpressionTree(const ExpressionNode & root);
     ExpressionTree(ExpressionNode::UP root);
     ExpressionTree(const ExpressionTree & rhs);
-    ExpressionTree(ExpressionTree &&) = default;
+    ExpressionTree(ExpressionTree &&) noexcept = default;
     ~ExpressionTree();
     ExpressionTree & operator = (ExpressionNode::UP rhs);
     ExpressionTree & operator = (const ExpressionTree & rhs);
-    ExpressionTree & operator = (ExpressionTree &&) = default;
+    ExpressionTree & operator = (ExpressionTree &&) noexcept = default;
 
     bool execute(DocId docId, HitRank rank) const;
     bool execute(const document::Document & doc, HitRank rank) const;
@@ -79,5 +78,4 @@ private:
     ArrayAtLookupList         _arrayAtLookupNodes;
 };
 
-} // namespace expression
-} // namespace search
+}