- Use modern enum class.

- Add hash method to FieldCollection.

2 files changed, 4 insertions, 4 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
index 8175e612bd4..fcb9a672039 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp
@@ -78,7 +78,7 @@ DocumentIterator::DocumentIterator(const storage::spi::Bucket &bucket,
       _fields(fields.clone()),
       _defaultSerializedSize((readConsistency == ReadConsistency::WEAK) ? defaultSerializedSize : -1),
       _readConsistency(readConsistency),
-      _metaOnly(fields.getType() == document::FieldSet::NONE),
+      _metaOnly(fields.getType() == document::FieldSet::Type::NONE),
       _ignoreMaxBytes((readConsistency == ReadConsistency::WEAK) && ignoreMaxBytes),
       _fetchedData(false),
       _sources(),
@@ -140,7 +140,7 @@ public:
                 _selectSession = _cachedSelect->createSession();
                 using document::select::GidFilter;
                 _gidFilter = GidFilter::for_selection_root_node(_selectSession->selectNode());
-                _selectCxt.reset(new SelectContext(*_cachedSelect));
+                _selectCxt = std::make_unique<SelectContext>(*_cachedSelect);
                 _selectCxt->getAttributeGuards();
             }
         } else {
@@ -216,7 +216,7 @@ public:
         }
     }
 
-    virtual bool allowVisitCaching() const override {
+    bool allowVisitCaching() const override {
         return _allowVisitCaching;
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
index 2659952ae03..da1b90aa167 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
@@ -436,7 +436,7 @@ PersistenceEngine::get(const Bucket& b, const document::FieldSet& fields, const
                 if (meta.removed) {
                     return GetResult::make_for_tombstone(meta.timestamp);
                 }
-                if (fields.NONE == fields.getType()) {
+                if (document::FieldSet::Type::NONE == fields.getType()) {
                     return GetResult::make_for_metadata_only(meta.timestamp);
                 }
                 document::Document::UP doc = retriever.getDocument(meta.lid);