=default

4 files changed, 44 insertions, 52 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
index 0ba4bc814d5..9e3b0bbde3e 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.cpp
@@ -39,8 +39,7 @@ ImportedAttributeVector::ImportedAttributeVector(vespalib::stringref name,
 {
 }
 
-ImportedAttributeVector::~ImportedAttributeVector() {
-}
+ImportedAttributeVector::~ImportedAttributeVector() = default;
 
 std::unique_ptr<AttributeReadGuard>
 ImportedAttributeVector::makeReadGuard(bool stableEnumGuard) const
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
index e6356866ed9..33afaaf7f1e 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
@@ -6,11 +6,9 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <memory>
 
-namespace search {
+namespace search { struct IDocumentMetaStoreContext; }
 
-struct IDocumentMetaStoreContext;
-
-namespace attribute {
+namespace search::attribute {
 
 class BitVectorSearchCache;
 class ReadableAttributeVector;
@@ -63,7 +61,7 @@ public:
         return _name;
     }
 
-    virtual std::unique_ptr<AttributeReadGuard> makeReadGuard(bool stableEnumGuard) const override;
+    std::unique_ptr<AttributeReadGuard> makeReadGuard(bool stableEnumGuard) const override;
 
 protected:
     vespalib::string                           _name;
@@ -75,4 +73,3 @@ protected:
 };
 
 }
-}
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp
index 428b14671cd..50fa1ffded3 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.cpp
@@ -6,8 +6,7 @@
 #include "reference_attribute.h"
 #include <vespa/searchlib/query/queryterm.h>
 
-namespace search {
-namespace attribute {
+namespace search::attribute {
 
 ImportedAttributeVectorReadGuard::ImportedAttributeVectorReadGuard(
         const ImportedAttributeVector &imported_attribute,
@@ -24,8 +23,7 @@ ImportedAttributeVectorReadGuard::ImportedAttributeVectorReadGuard(
     _targetLids = _reference_attribute.getTargetLids();
 }
 
-ImportedAttributeVectorReadGuard::~ImportedAttributeVectorReadGuard() {
-}
+ImportedAttributeVectorReadGuard::~ImportedAttributeVectorReadGuard() = default;
 
 const vespalib::string& ImportedAttributeVectorReadGuard::getName() const {
     return _imported_attribute.getName();
@@ -169,4 +167,3 @@ long ImportedAttributeVectorReadGuard::onSerializeForDescendingSort(DocId doc,
 }
 
 }
-}
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h
index 4cf4d5b64c1..f130a095006 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_read_guard.h
@@ -45,49 +45,48 @@ protected:
     }
 
 public:
-    ImportedAttributeVectorReadGuard(const ImportedAttributeVector &imported_attribute,
-                                     bool stableEnumGuard);
-    ~ImportedAttributeVectorReadGuard();
+    ImportedAttributeVectorReadGuard(const ImportedAttributeVector &imported_attribute, bool stableEnumGuard);
+    ~ImportedAttributeVectorReadGuard() override;
 
-    virtual const vespalib::string &getName() const override;
-    virtual uint32_t getNumDocs() const override;
-    virtual uint32_t getValueCount(uint32_t doc) const override;
-    virtual uint32_t getMaxValueCount() const override;
-    virtual largeint_t getInt(DocId doc) const override;
-    virtual double getFloat(DocId doc) const override;
-    virtual const char *getString(DocId doc, char *buffer, size_t sz) const override;
-    virtual EnumHandle getEnum(DocId doc) const override;
-    virtual uint32_t get(DocId docId, largeint_t *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, double *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, const char **buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, EnumHandle *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, WeightedInt *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, WeightedFloat *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, WeightedString *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, WeightedConstChar *buffer, uint32_t sz) const override;
-    virtual uint32_t get(DocId docId, WeightedEnum *buffer, uint32_t sz) const override;
-    virtual bool findEnum(const char * value, EnumHandle & e) const override;
-    virtual std::vector<EnumHandle> findFoldedEnums(const char *value) const override;
+    const vespalib::string &getName() const override;
+    uint32_t getNumDocs() const override;
+    uint32_t getValueCount(uint32_t doc) const override;
+    uint32_t getMaxValueCount() const override;
+    largeint_t getInt(DocId doc) const override;
+    double getFloat(DocId doc) const override;
+    const char *getString(DocId doc, char *buffer, size_t sz) const override;
+    EnumHandle getEnum(DocId doc) const override;
+    uint32_t get(DocId docId, largeint_t *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, double *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, const char **buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, EnumHandle *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, WeightedInt *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, WeightedFloat *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, WeightedString *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, WeightedConstChar *buffer, uint32_t sz) const override;
+    uint32_t get(DocId docId, WeightedEnum *buffer, uint32_t sz) const override;
+    bool findEnum(const char * value, EnumHandle & e) const override;
+    std::vector<EnumHandle> findFoldedEnums(const char *value) const override;
 
-    virtual const char * getStringFromEnum(EnumHandle e) const override;
-    virtual std::unique_ptr<ISearchContext> createSearchContext(std::unique_ptr<QueryTermSimple> term,
-                                                                const SearchContextParams &params) const override;
-    virtual const IDocumentWeightAttribute *asDocumentWeightAttribute() const override;
-    virtual const tensor::ITensorAttribute *asTensorAttribute() const override;
-    virtual BasicType::Type getBasicType() const override;
-    virtual size_t getFixedWidth() const override;
-    virtual CollectionType::Type getCollectionType() const override;
-    virtual bool hasEnum() const override;
-    virtual bool getIsFilter() const override;
-    virtual bool getIsFastSearch() const override;
-    virtual uint32_t getCommittedDocIdLimit() const override;
-    virtual bool isImported() const override;
+    const char * getStringFromEnum(EnumHandle e) const override;
+    std::unique_ptr<ISearchContext> createSearchContext(std::unique_ptr<QueryTermSimple> term,
+                                                        const SearchContextParams &params) const override;
+    const IDocumentWeightAttribute *asDocumentWeightAttribute() const override;
+    const tensor::ITensorAttribute *asTensorAttribute() const override;
+    BasicType::Type getBasicType() const override;
+    size_t getFixedWidth() const override;
+    CollectionType::Type getCollectionType() const override;
+    bool hasEnum() const override;
+    bool getIsFilter() const override;
+    bool getIsFastSearch() const override;
+    uint32_t getCommittedDocIdLimit() const override;
+    bool isImported() const override;
 
 protected:
-    virtual long onSerializeForAscendingSort(DocId doc, void * serTo, long available,
-                                             const common::BlobConverter * bc) const override;
-    virtual long onSerializeForDescendingSort(DocId doc, void * serTo, long available,
-                                              const common::BlobConverter * bc) const override;
+    long onSerializeForAscendingSort(DocId doc, void * serTo, long available,
+                                     const common::BlobConverter * bc) const override;
+    long onSerializeForDescendingSort(DocId doc, void * serTo, long available,
+                                      const common::BlobConverter * bc) const override;
 };
 
 }