Some cleanup after major rebase.

3 files changed, 6 insertions, 9 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
index 0c312a6fe6a..a9b2a50cac3 100644
--- a/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createarraystd.cpp
@@ -5,7 +5,7 @@
 #include "attributevector.hpp"
 #include "multivalueattribute.hpp"
 #include "multinumericattribute.hpp"
-#include "multistringattribute.h"
+#include "multistringattribute.hpp"
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
index 721af2891e3..262ec2c23df 100644
--- a/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/createsetstd.cpp
@@ -5,7 +5,7 @@
 #include "attributevector.hpp"
 #include "multivalueattribute.hpp"
 #include "multinumericattribute.hpp"
-#include "multistringattribute.h"
+#include "multistringattribute.hpp"
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.h b/searchlib/src/vespa/searchlib/attribute/numericbase.h
index 2554102b511..ee6effa810a 100644
--- a/searchlib/src/vespa/searchlib/attribute/numericbase.h
+++ b/searchlib/src/vespa/searchlib/attribute/numericbase.h
@@ -3,9 +3,9 @@
 #pragma once
 
 #include "attributevector.h"
-#include <vespa/searchlib/common/sort.h>
 #include "enumstorebase.h"
 #include "loadedenumvalue.h"
+#include <vespa/searchlib/common/sort.h>
 
 namespace search {
 
@@ -28,7 +28,7 @@ protected:
     virtual void fillEnumIdx(ReaderBase &attrReader, const EnumIndexVector &eidxs, EnumVector &enumHist);
     virtual void fillPostingsFixupEnum(const attribute::LoadedEnumAttributeVector &loaded);
     virtual void fixupEnumRefCounts(const EnumVector &enumHist);
-    virtual bool onAddDoc(DocId) { return true; }
+    bool onAddDoc(DocId) override { return true; }
 
     template<typename T>
     class Equal
@@ -58,8 +58,7 @@ protected:
     protected:
         Range(const QueryTermSimple & queryTerm, bool avoidUndefinedInRange=false);
         Int64Range getRange() const {
-            return Int64Range(static_cast<int64_t>(_low),
-                              static_cast<int64_t>(_high));
+            return Int64Range(static_cast<int64_t>(_low), static_cast<int64_t>(_high));
         }
         bool isValid() const { return _valid; }
         bool match(T v) const { return (_low <= v) && (v <= _high); }
@@ -76,8 +75,7 @@ protected:
             BaseType numMin = std::numeric_limits<BaseType>::min();
             BaseType numMax = std::numeric_limits<BaseType>::max();
 
-            if (isFloat)
-            {
+            if (isFloat) {
                 if (_low <= (-numMax)) {
                     low = -numMax;
                 }
@@ -103,4 +101,3 @@ public:
 };
 
 } // namespace search
-