No need to inherit Identifiable.

7 files changed, 19 insertions, 19 deletions

diff --git a/document/src/tests/fieldsettest.cpp b/document/src/tests/fieldsettest.cpp
index af23e713735..8f77bfd2c0d 100644
--- a/document/src/tests/fieldsettest.cpp
+++ b/document/src/tests/fieldsettest.cpp
@@ -280,4 +280,8 @@ TEST(FieldCollectionTest, testHash ) {
     EXPECT_EQ(0x1e0918531b19734ul, FieldCollection(type, Field::Set::Builder().add(&type.getField("hstringval")).build()).hash());
 }
 
+TEST(FieldTest, testSizeOf) {
+    EXPECT_EQ(sizeof(Field), 96);
+}
+
 } // document
diff --git a/document/src/vespa/document/base/field.h b/document/src/vespa/document/base/field.h
index 3a0c9b82136..eb772131392 100644
--- a/document/src/vespa/document/base/field.h
+++ b/document/src/vespa/document/base/field.h
@@ -12,9 +12,9 @@
 #pragma once
 
 #include <vespa/document/fieldset/fieldset.h>
-#include <vespa/vespalib/objects/identifiable.h>
 #include <vespa/vespalib/objects/fieldbase.h>
 #include <set>
+#include <vector>
 
 namespace document {
 
@@ -22,7 +22,6 @@ class FieldValue;
 class DataType;
 
 class Field final : public vespalib::FieldBase,
-                    public vespalib::Identifiable,
                     public FieldSet
 {
     const DataType *_dataType;
diff --git a/document/src/vespa/document/base/fieldpath.cpp b/document/src/vespa/document/base/fieldpath.cpp
index 2606aa269ed..9b286255518 100644
--- a/document/src/vespa/document/base/fieldpath.cpp
+++ b/document/src/vespa/document/base/fieldpath.cpp
@@ -67,7 +67,8 @@ FieldPathEntry::FieldPathEntry(const DataType & dataType, const DataType& fillTy
     setFillValue(fillType);
 }
 
-void FieldPathEntry::setFillValue(const DataType & dataType)
+void
+FieldPathEntry::setFillValue(const DataType & dataType)
 {
     const DataType * dt = & dataType;
 
@@ -113,12 +114,14 @@ FieldPathEntry::FieldPathEntry(const DataType & dataType, vespalib::stringref va
     setFillValue(*_dataType);
 }
 
-const DataType &FieldPathEntry::getDataType() const
+const DataType &
+FieldPathEntry::getDataType() const
 {
      return _field.valid() ? _field.getDataType() : *_dataType;
 }
 
-FieldValue::UP FieldPathEntry::stealFieldValueToSet() const
+FieldValue::UP
+FieldPathEntry::stealFieldValueToSet() const
 {
     return FieldValue::UP(_fillInVal.release());
 }
@@ -128,7 +131,6 @@ FieldPathEntry::visitMembers(vespalib::ObjectVisitor &visitor) const
 {
     visit(visitor, "type", _type);
     visit(visitor, "name", _name);
-    visit(visitor, "fieldRef", _field);
     visit(visitor, "dataType", _dataType);
     visit(visitor, "lookupIndex", _lookupIndex);
     visit(visitor, "lookupKey", _lookupKey);
@@ -136,7 +138,8 @@ FieldPathEntry::visitMembers(vespalib::ObjectVisitor &visitor) const
     visit(visitor, "fillInVal", _fillInVal);
 }
 
-vespalib::string FieldPathEntry::parseKey(vespalib::stringref & key)
+vespalib::string
+FieldPathEntry::parseKey(vespalib::stringref & key)
 {
     vespalib::string v;
     const char *c = key.data();
@@ -186,7 +189,7 @@ FieldPath::FieldPath()
 
 FieldPath::FieldPath(const FieldPath &) = default;
 FieldPath & FieldPath::operator=(const FieldPath &) = default;
-FieldPath::~FieldPath() { }
+FieldPath::~FieldPath() = default;
 
 FieldPath::iterator FieldPath::insert(iterator pos, std::unique_ptr<FieldPathEntry> entry) {
     return _path.insert(pos, vespalib::CloneablePtr<FieldPathEntry>(entry.release()));
diff --git a/searchlib/src/vespa/searchlib/expression/floatbucketresultnode.cpp b/searchlib/src/vespa/searchlib/expression/floatbucketresultnode.cpp
index daf9652f681..29c7d81eed4 100644
--- a/searchlib/src/vespa/searchlib/expression/floatbucketresultnode.cpp
+++ b/searchlib/src/vespa/searchlib/expression/floatbucketresultnode.cpp
@@ -3,8 +3,7 @@
 #include <vespa/vespalib/objects/visit.h>
 #include <cmath>
 
-namespace search {
-namespace expression {
+namespace search::expression {
 
 IMPLEMENT_RESULTNODE(FloatBucketResultNode, BucketResultNode);
 
@@ -78,7 +77,6 @@ FloatBucketResultNode::onDeserialize(vespalib::Deserializer & is)
 }
 
 }
-}
 
 // this function was added by ../../forcelink.sh
 void forcelink_file_searchlib_expression_floatbucketresultnode() {}
diff --git a/searchlib/src/vespa/searchlib/expression/integerbucketresultnode.cpp b/searchlib/src/vespa/searchlib/expression/integerbucketresultnode.cpp
index 1bdd2975612..b19e62ad244 100644
--- a/searchlib/src/vespa/searchlib/expression/integerbucketresultnode.cpp
+++ b/searchlib/src/vespa/searchlib/expression/integerbucketresultnode.cpp
@@ -2,8 +2,7 @@
 #include "integerbucketresultnode.h"
 #include <vespa/vespalib/objects/visit.h>
 
-namespace search {
-namespace expression {
+namespace search::expression {
 
 IMPLEMENT_RESULTNODE(IntegerBucketResultNode, BucketResultNode);
 
@@ -66,7 +65,6 @@ IntegerBucketResultNode::onDeserialize(vespalib::Deserializer & is)
 }
 
 }
-}
 
 // this function was added by ../../forcelink.sh
 void forcelink_file_searchlib_expression_integerbucketresultnode() {}
diff --git a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
index 603600847b7..9938d1a3d55 100644
--- a/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
+++ b/searchlib/src/vespa/searchlib/expression/stringbucketresultnode.cpp
@@ -3,8 +3,7 @@
 #include "stringbucketresultnode.h"
 #include <vespa/vespalib/objects/visit.hpp>
 
-namespace search {
-namespace expression {
+namespace search::expression {
 
 IMPLEMENT_RESULTNODE(StringBucketResultNode, BucketResultNode);
 
@@ -44,7 +43,7 @@ StringBucketResultNode::StringBucketResultNode(vespalib::stringref from, vespali
     : _from(new StringResultNode(from)),
       _to(new StringResultNode(to))
 {}
-StringBucketResultNode::~StringBucketResultNode() {}
+StringBucketResultNode::~StringBucketResultNode() = default;
 
 int
 StringBucketResultNode::onCmp(const Identifiable & rhs) const
@@ -97,7 +96,6 @@ StringBucketResultNode::onDeserialize(vespalib::Deserializer & is)
 }
 
 }
-}
 
 // this function was added by ../../forcelink.sh
 void forcelink_file_searchlib_expression_stringbucketresultnode() {}
diff --git a/staging_vespalib/src/vespa/vespalib/objects/fieldbase.h b/staging_vespalib/src/vespa/vespalib/objects/fieldbase.h
index d10687a36ad..2de113f8383 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/fieldbase.h
+++ b/staging_vespalib/src/vespa/vespalib/objects/fieldbase.h
@@ -8,7 +8,7 @@ namespace vespalib {
 class IFieldBase
 {
 public:
-    virtual ~IFieldBase() { }
+    virtual ~IFieldBase() = default;
     // Overrides must guarantee that returned reference is zero-terminated.
     virtual stringref getName() const = 0;
 };