Unify on 'using'

2 files changed, 5 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
index ad7d6fe3456..6fb757fe0a6 100644
--- a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
@@ -191,7 +191,7 @@ DocumentFeaturesStore::remove(uint32_t doc_id) {
         _ranges.erase(range_itr);
     }
     if (_currDocId == doc_id) {
-        setCurrent(0, NULL);
+        setCurrent(0, nullptr);
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
index 5f55a2d3d5f..00eff027477 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
@@ -16,9 +16,9 @@ struct Interval;
  */
 class PredicateIntervalStore {
     class DataStoreAdapter;
-    typedef PredicateRefCache<DataStoreAdapter, 8> RefCacheType;
-    typedef vespalib::datastore::DataStoreT<vespalib::datastore::EntryRefT<18, 6>> DataStoreType;
-    typedef DataStoreType::RefType RefType;
+    using RefCacheType = PredicateRefCache<DataStoreAdapter, 8>;
+    using DataStoreType = vespalib::datastore::DataStoreT<vespalib::datastore::EntryRefT<18, 6>>;
+    using RefType =  DataStoreType::RefType;
     using generation_t = vespalib::GenerationHandler::generation_t;
 
     DataStoreType _store;
@@ -90,9 +90,7 @@ public:
      */
     template <typename IntervalT>
     const IntervalT
-    *get(vespalib::datastore::EntryRef btree_ref,
-                         uint32_t &size_out,
-                         IntervalT *single_buf) const
+    *get(vespalib::datastore::EntryRef btree_ref, uint32_t &size_out, IntervalT *single_buf) const
     {
         uint32_t size = btree_ref.ref() >> RefCacheType::SIZE_SHIFT;
         RefType data_ref(vespalib::datastore::EntryRef(btree_ref.ref() & RefCacheType::DATA_REF_MASK));