Deinlinebalder/deinline

2 files changed, 4 insertions, 8 deletions

diff --git a/searchlib/src/vespa/searchlib/expression/functionnodes.cpp b/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
index 9046a5427ce..cc6a8c137a7 100644
--- a/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
+++ b/searchlib/src/vespa/searchlib/expression/functionnodes.cpp
@@ -3,9 +3,7 @@
 #include "floatresultnode.h"
 #include "stringresultnode.h"
 #include "rawresultnode.h"
-#include "enumresultnode.h"
 #include "constantnode.h"
-#include "relevancenode.h"
 #include "addfunctionnode.h"
 #include "dividefunctionnode.h"
 #include "multiplyfunctionnode.h"
@@ -29,8 +27,6 @@
 #include "xorbitfunctionnode.h"
 #include "md5bitfunctionnode.h"
 #include "binaryfunctionnode.h"
-#include "nullresultnode.h"
-#include "positiveinfinityresultnode.h"
 #include "resultvector.h"
 #include "catserializer.h"
 #include "strcatserializer.h"
@@ -320,6 +316,8 @@ ResultNode::CP DivideFunctionNode::getInitialValue() const
    throw std::runtime_error("DivideFunctionNode::getInitialValue() const not implemented since it shall never be used.");
 }
 
+UnaryBitFunctionNode::~UnaryBitFunctionNode() = default;
+
 void UnaryBitFunctionNode::onPrepareResult()
 {
     setResultType(std::unique_ptr<ResultNode>(new RawResultNode()));
diff --git a/searchlib/src/vespa/searchlib/expression/unarybitfunctionnode.h b/searchlib/src/vespa/searchlib/expression/unarybitfunctionnode.h
index 63114188b1f..536d881cb90 100644
--- a/searchlib/src/vespa/searchlib/expression/unarybitfunctionnode.h
+++ b/searchlib/src/vespa/searchlib/expression/unarybitfunctionnode.h
@@ -4,8 +4,7 @@
 #include "unaryfunctionnode.h"
 #include <vespa/vespalib/objects/nbostream.h>
 
-namespace search {
-namespace expression {
+namespace search::expression {
 
 class UnaryBitFunctionNode : public UnaryFunctionNode
 {
@@ -15,6 +14,7 @@ public:
     DECLARE_ABSTRACT_EXPRESSIONNODE(UnaryBitFunctionNode);
     UnaryBitFunctionNode() : _numBits(0) { }
     UnaryBitFunctionNode(ExpressionNode::UP arg, unsigned numBits) : UnaryFunctionNode(std::move(arg)), _numBits(numBits) { }
+    ~UnaryBitFunctionNode() override;
 protected:
     size_t getNumBits()  const { return _numBits; }
     size_t getNumBytes() const { return (_numBits+7)/8; }
@@ -28,5 +28,3 @@ private:
 };
 
 }
-}
-