Change from typedef to using in storage C++ code.

49 files changed, 104 insertions, 104 deletions

diff --git a/storage/src/tests/persistence/common/filestortestfixture.h b/storage/src/tests/persistence/common/filestortestfixture.h
index 1a92a2c1944..d0b0f1af074 100644
--- a/storage/src/tests/persistence/common/filestortestfixture.h
+++ b/storage/src/tests/persistence/common/filestortestfixture.h
@@ -20,8 +20,8 @@ public:
 
     static const uint32_t MSG_WAIT_TIME = 60 * 1000;
 
-    typedef uint32_t DocumentIndex;
-    typedef uint64_t PutTimestamp;
+    using DocumentIndex = uint32_t;
+    using PutTimestamp = uint64_t;
 
     void SetUp() override;
     void TearDown() override;
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index ecf4ddde911..000e1e1c155 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -31,7 +31,7 @@ class BlockingMockProvider : public PersistenceProviderWrapper
     vespalib::Barrier& _queueBarrier;
     vespalib::Barrier& _completionBarrier;
 public:
-    typedef std::unique_ptr<BlockingMockProvider> UP;
+    using UP = std::unique_ptr<BlockingMockProvider>;
 
     mutable std::atomic<uint32_t> _bucketInfoInvocations;
     std::atomic<uint32_t> _createBucketInvocations;
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index e9d399d357f..366e976b3e2 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -876,7 +876,7 @@ TEST_F(MergeHandlerTest, merge_bucket_spi_failures) {
         { PersistenceProviderWrapper::FAIL_CREATE_ITERATOR, "create iterator" },
         { PersistenceProviderWrapper::FAIL_ITERATE, "iterate" },
     };
-    typedef ExpectedExceptionSpec* ExceptionIterator;
+    using ExceptionIterator = ExpectedExceptionSpec*;
     ExceptionIterator last = exceptions + sizeof(exceptions)/sizeof(exceptions[0]);
 
     for (ExceptionIterator it = exceptions; it != last; ++it) {
@@ -907,7 +907,7 @@ TEST_F(MergeHandlerTest, get_bucket_diff_spi_failures) {
         { PersistenceProviderWrapper::FAIL_ITERATE, "iterate" },
     };
 
-    typedef ExpectedExceptionSpec* ExceptionIterator;
+    using ExceptionIterator = ExpectedExceptionSpec*;
     ExceptionIterator last = exceptions + sizeof(exceptions)/sizeof(exceptions[0]);
 
     for (ExceptionIterator it = exceptions; it != last; ++it) {
@@ -941,7 +941,7 @@ TEST_F(MergeHandlerTest, apply_bucket_diff_spi_failures) {
         { PersistenceProviderWrapper::FAIL_REMOVE, "Failed remove" },
     };
 
-    typedef ExpectedExceptionSpec* ExceptionIterator;
+    using ExceptionIterator = ExpectedExceptionSpec*;
     ExceptionIterator last = exceptions + sizeof(exceptions)/sizeof(exceptions[0]);
 
     for (ExceptionIterator it = exceptions; it != last; ++it) {
@@ -1006,7 +1006,7 @@ TEST_F(MergeHandlerTest, get_bucket_diff_reply_spi_failures) {
         { PersistenceProviderWrapper::FAIL_ITERATE, "iterate" },
     };
 
-    typedef ExpectedExceptionSpec* ExceptionIterator;
+    using ExceptionIterator = ExpectedExceptionSpec*;
     ExceptionIterator last = exceptions + sizeof(exceptions)/sizeof(exceptions[0]);
 
     for (ExceptionIterator it = exceptions; it != last; ++it) {
@@ -1109,7 +1109,7 @@ TEST_F(MergeHandlerTest, apply_bucket_diff_reply_spi_failures) {
             { PersistenceProviderWrapper::FAIL_REMOVE, "Failed remove" },
         };
 
-        typedef ExpectedExceptionSpec* ExceptionIterator;
+        using ExceptionIterator = ExpectedExceptionSpec*;
         ExceptionIterator last = exceptions + sizeof(exceptions)/sizeof(exceptions[0]);
 
         for (ExceptionIterator it = exceptions; it != last; ++it) {
diff --git a/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp b/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
index aeef0f613b2..09ee8e46a1a 100644
--- a/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
+++ b/storage/src/tests/storageapi/mbusprot/storageprotocoltest.cpp
@@ -439,7 +439,7 @@ TEST_P(StorageProtocolTest, delete_bucket) {
 }
 
 TEST_P(StorageProtocolTest, merge_bucket) {
-    typedef api::MergeBucketCommand::Node Node;
+    using Node = api::MergeBucketCommand::Node;
     std::vector<Node> nodes;
     nodes.push_back(Node(4, false));
     nodes.push_back(Node(13, true));
diff --git a/storage/src/tests/storageserver/testvisitormessagesession.h b/storage/src/tests/storageserver/testvisitormessagesession.h
index d10e8f0c285..c0c3b8429b2 100644
--- a/storage/src/tests/storageserver/testvisitormessagesession.h
+++ b/storage/src/tests/storageserver/testvisitormessagesession.h
@@ -22,7 +22,7 @@ private:
     bool _autoReply;
 
 public:
-    typedef std::unique_ptr<TestVisitorMessageSession> UP;
+    using UP = std::unique_ptr<TestVisitorMessageSession>;
 
     VisitorThread& thread;
     Visitor& visitor;
diff --git a/storage/src/vespa/storage/bucketdb/btree_lockable_map.h b/storage/src/vespa/storage/bucketdb/btree_lockable_map.h
index 3cc3249e6e0..fdbd158864c 100644
--- a/storage/src/vespa/storage/bucketdb/btree_lockable_map.h
+++ b/storage/src/vespa/storage/bucketdb/btree_lockable_map.h
@@ -79,7 +79,7 @@ private:
         size_t operator () (const LockId & lid) const { return lid.hash(); }
     };
     class LockIdSet : public vespalib::hash_set<LockId, hasher> {
-        typedef vespalib::hash_set<LockId, hasher> Hash;
+        using Hash = vespalib::hash_set<LockId, hasher>;
     public:
         LockIdSet();
         ~LockIdSet();
@@ -89,10 +89,10 @@ private:
     };
 
     class LockWaiters {
-        typedef vespalib::hash_map<size_t, LockId> WaiterMap;
+        using WaiterMap = vespalib::hash_map<size_t, LockId>;
     public:
-        typedef size_t Key;
-        typedef typename WaiterMap::const_iterator const_iterator;
+        using Key = size_t;
+        using const_iterator = typename WaiterMap::const_iterator;
         LockWaiters();
         ~LockWaiters();
         Key insert(const LockId & lid);
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
index 64c66401992..8e25c9a2ffb 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
@@ -510,7 +510,7 @@ BucketManager::processRequestBucketInfoCommands(document::BucketSpace bucketSpac
     //   from the current cluster state.
 
     std::set<uint16_t> seenDistributors;
-    typedef std::shared_ptr<api::RequestBucketInfoCommand> RBISP;
+    using RBISP = std::shared_ptr<api::RequestBucketInfoCommand>;
     std::map<uint16_t, RBISP> requests;
 
     auto distribution(_component.getBucketSpaceRepo().get(bucketSpace).getDistribution());
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.h b/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.h
index a856a9bf9a1..98a0c3e7010 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.h
+++ b/storage/src/vespa/storage/bucketdb/bucketmanagermetrics.h
@@ -12,7 +12,7 @@
 namespace storage {
 
 struct DataStoredMetrics : metrics::MetricSet {
-    typedef std::shared_ptr<DataStoredMetrics> SP;
+    using SP = std::shared_ptr<DataStoredMetrics>;
 
     metrics::LongValueMetric buckets;
     metrics::LongValueMetric docs;
diff --git a/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp b/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
index 618e49c4238..d79bf2c4810 100644
--- a/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemetricsset.cpp
@@ -53,7 +53,7 @@ MergeBucketMetricSet::~MergeBucketMetricSet() = default;
 
 void
 IdealStateMetricSet::createOperationMetrics() {
-    typedef IdealStateOperation ISO;
+    using ISO = IdealStateOperation;
     operations.resize(ISO::OPERATION_COUNT);
     // Note: naked new is used instead of make_shared due to the latter not being
     // able to properly transitively deduce the types for the tag initializer lists.
diff --git a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
index 57b5a5cbce8..93499d9ebce 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/distributorcomponentregisterimpl.h
@@ -32,7 +32,7 @@ class DistributorComponentRegisterImpl
     std::shared_ptr<lib::ClusterState> _clusterState;
 
 public:
-    typedef std::unique_ptr<DistributorComponentRegisterImpl> UP;
+    using UP = std::unique_ptr<DistributorComponentRegisterImpl>;
 
     DistributorComponentRegisterImpl();
     ~DistributorComponentRegisterImpl() override;
diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
index cc8501c8027..0909def0e5c 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h
@@ -24,7 +24,7 @@ class ServiceLayerComponentRegisterImpl
     MinimumUsedBitsTracker _minUsedBitsTracker;
 
 public:
-    typedef std::unique_ptr<ServiceLayerComponentRegisterImpl> UP;
+    using UP = std::unique_ptr<ServiceLayerComponentRegisterImpl>;
 
     explicit ServiceLayerComponentRegisterImpl(const ContentBucketDbOptions&);
 
diff --git a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
index 0b1447de49b..b236b6779bf 100644
--- a/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
+++ b/storage/src/vespa/storage/frameworkimpl/component/storagecomponentregisterimpl.h
@@ -33,7 +33,7 @@ class StorageComponentRegisterImpl
     BucketspacesConfig _bucketSpacesConfig;
 
 public:
-    typedef std::unique_ptr<StorageComponentRegisterImpl> UP;
+    using UP = std::unique_ptr<StorageComponentRegisterImpl>;
 
     StorageComponentRegisterImpl();
     ~StorageComponentRegisterImpl() override;
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
index 26db7ff5069..51149830329 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.h
@@ -53,7 +53,7 @@ class StatusWebServer : private config::IFetcherCallback<vespa::config::content:
         }
     };
     struct HttpRequest {
-        typedef std::shared_ptr<HttpRequest> SP;
+        using SP = std::shared_ptr<HttpRequest>;
 
         vespalib::string _url;
         vespalib::string _serverSpec;
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/appkiller.h b/storage/src/vespa/storage/frameworkimpl/thread/appkiller.h
index 54078b8d8b7..de8005bf914 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/appkiller.h
+++ b/storage/src/vespa/storage/frameworkimpl/thread/appkiller.h
@@ -16,7 +16,7 @@
 namespace storage {
 
 struct AppKiller {
-    typedef std::unique_ptr<AppKiller> UP;
+    using UP = std::unique_ptr<AppKiller>;
     virtual ~AppKiller() {}
     virtual void kill() = 0;
 };
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/htmltable.h b/storage/src/vespa/storage/frameworkimpl/thread/htmltable.h
index 1aee514a560..71ed2da4e9e 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/htmltable.h
+++ b/storage/src/vespa/storage/frameworkimpl/thread/htmltable.h
@@ -164,7 +164,7 @@ struct ByteSizeColumn : public ValueColumn<uint64_t> {
     void printValue(std::ostream& out, uint16_t row) override;
 };
 
-typedef ValueColumn<int64_t>     LongColumn;
-typedef ValueColumn<double>      DoubleColumn;
+using LongColumn = ValueColumn<int64_t>;
+using DoubleColumn = ValueColumn<double>;
 
 } // storage
diff --git a/storage/src/vespa/storage/persistence/diskthread.h b/storage/src/vespa/storage/persistence/diskthread.h
index 2d10349ae64..cafed748d9b 100644
--- a/storage/src/vespa/storage/persistence/diskthread.h
+++ b/storage/src/vespa/storage/persistence/diskthread.h
@@ -22,7 +22,7 @@ namespace storage {
 class DiskThread : public framework::Runnable
 {
 public:
-    typedef std::shared_ptr<DiskThread> SP;
+    using SP = std::shared_ptr<DiskThread>;
 
     DiskThread(const DiskThread &) = delete;
     DiskThread & operator = (const DiskThread &) = delete;
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 6d69a29fc6e..49b3b02e240 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -295,7 +295,7 @@ FileStorManager::mapOperationToBucketAndDisk(api::BucketCommand& cmd, const docu
         if (docId) {
             specific = _bucketIdFactory.getBucketId(*docId);
         }
-        typedef std::map<document::BucketId, StorBucketDatabase::WrappedEntry> BucketMap;
+        using BucketMap = std::map<document::BucketId, StorBucketDatabase::WrappedEntry>;
         std::shared_ptr<api::StorageReply> reply;
         {
             BucketMap results( database.getContained( specific, "FileStorManager::mapOperationToBucketAndDisk-2"));
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index 53bf087f036..9a01cab8dd5 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -19,7 +19,7 @@ namespace storage {
 
 struct FileStorThreadMetrics : public metrics::MetricSet
 {
-    typedef std::shared_ptr<FileStorThreadMetrics> SP;
+    using SP = std::shared_ptr<FileStorThreadMetrics>;
 
     struct Op : metrics::MetricSet {
         std::string _name;
diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
index 8c0b4084428..0695c35c7ad 100644
--- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
+++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
@@ -27,7 +27,7 @@ class ModifiedBucketChecker
               vespa::config::content::core::StorServerConfig>
 {
 public:
-    typedef std::unique_ptr<ModifiedBucketChecker> UP;
+    using UP = std::unique_ptr<ModifiedBucketChecker>;
 
     ModifiedBucketChecker(ServiceLayerComponentRegister& compReg,
                           spi::PersistenceProvider& provide,
diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp
index ae68a694c90..684c21e4c3e 100644
--- a/storage/src/vespa/storage/persistence/mergehandler.cpp
+++ b/storage/src/vespa/storage/persistence/mergehandler.cpp
@@ -179,7 +179,7 @@ MergeHandler::buildBucketInfoList(
     assert(output.size() == 0);
     assert(myNodeIndex < 16);
     uint32_t oldSize = output.size();
-    typedef api::BucketInfo DbBucketInfo;
+    using DbBucketInfo = api::BucketInfo;
 
     // Always verify that bucket database is correct in merge, such that
     // any out of sync data get fixed. Such errors must of course also be
diff --git a/storage/src/vespa/storage/persistence/messages.h b/storage/src/vespa/storage/persistence/messages.h
index 86cf1ac3b06..faba3995c6f 100644
--- a/storage/src/vespa/storage/persistence/messages.h
+++ b/storage/src/vespa/storage/persistence/messages.h
@@ -19,8 +19,8 @@ private:
 
 public:
     static constexpr uint32_t ID = 1001;
-    typedef std::unique_ptr<GetIterCommand> UP;
-    typedef std::shared_ptr<GetIterCommand> SP;
+    using UP = std::unique_ptr<GetIterCommand>;
+    using SP = std::shared_ptr<GetIterCommand>;
 
     GetIterCommand(const document::Bucket &bucket,
                    spi::IteratorId iteratorId,
@@ -51,8 +51,8 @@ private:
     bool             _completed;
 
 public:
-    typedef std::unique_ptr<GetIterReply> UP;
-    typedef std::shared_ptr<GetIterReply> SP;
+    using UP = std::unique_ptr<GetIterReply>;
+    using SP = std::shared_ptr<GetIterReply>;
     static constexpr uint32_t ID = 1002;
 
     explicit GetIterReply(GetIterCommand& cmd);
@@ -80,8 +80,8 @@ class CreateIteratorCommand : public api::InternalCommand
 
 public:
     static constexpr uint32_t ID = 1003;
-    typedef std::unique_ptr<CreateIteratorCommand> UP;
-    typedef std::shared_ptr<CreateIteratorCommand> SP;
+    using UP = std::unique_ptr<CreateIteratorCommand>;
+    using SP = std::shared_ptr<CreateIteratorCommand>;
 
     CreateIteratorCommand(const document::Bucket &bucket,
                           const spi::Selection& selection,
@@ -114,8 +114,8 @@ class CreateIteratorReply : public api::InternalReply
     spi::IteratorId _iteratorId;
 public:
     static constexpr uint32_t ID = 1004;
-    typedef std::unique_ptr<CreateIteratorReply> UP;
-    typedef std::shared_ptr<CreateIteratorReply> SP;
+    using UP = std::unique_ptr<CreateIteratorReply>;
+    using SP = std::shared_ptr<CreateIteratorReply>;
 
     CreateIteratorReply(const CreateIteratorCommand& cmd, spi::IteratorId iteratorId);
     ~CreateIteratorReply() override;
@@ -132,8 +132,8 @@ class DestroyIteratorCommand : public api::InternalCommand
     spi::IteratorId _iteratorId;
 public:
     static constexpr uint32_t ID = 1005;
-    typedef std::unique_ptr<DestroyIteratorCommand> UP;
-    typedef std::shared_ptr<DestroyIteratorCommand> SP;
+    using UP = std::unique_ptr<DestroyIteratorCommand>;
+    using SP = std::shared_ptr<DestroyIteratorCommand>;
 
     explicit DestroyIteratorCommand(spi::IteratorId iteratorId);
     ~DestroyIteratorCommand() override;
@@ -150,8 +150,8 @@ class DestroyIteratorReply : public api::InternalReply
     spi::IteratorId _iteratorId;
 public:
     static constexpr uint32_t ID = 1006;
-    typedef std::unique_ptr<DestroyIteratorReply> UP;
-    typedef std::shared_ptr<DestroyIteratorReply> SP;
+    using UP = std::unique_ptr<DestroyIteratorReply>;
+    using SP = std::shared_ptr<DestroyIteratorReply>;
 
     explicit DestroyIteratorReply(const DestroyIteratorCommand& cmd);
     ~DestroyIteratorReply() override;
@@ -164,8 +164,8 @@ class RecheckBucketInfoCommand : public api::InternalCommand
     document::Bucket _bucket;
 public:
     static constexpr uint32_t ID = 1007;
-    typedef std::shared_ptr<RecheckBucketInfoCommand> SP;
-    typedef std::unique_ptr<RecheckBucketInfoCommand> UP;
+    using SP = std::shared_ptr<RecheckBucketInfoCommand>;
+    using UP = std::unique_ptr<RecheckBucketInfoCommand>;
 
     explicit RecheckBucketInfoCommand(const document::Bucket &bucket);
     ~RecheckBucketInfoCommand() override;
@@ -182,8 +182,8 @@ class RecheckBucketInfoReply : public api::InternalReply
     document::Bucket _bucket;
 public:
     static constexpr uint32_t ID = 1008;
-    typedef std::shared_ptr<RecheckBucketInfoReply> SP;
-    typedef std::unique_ptr<RecheckBucketInfoReply> UP;
+    using SP = std::shared_ptr<RecheckBucketInfoReply>;
+    using UP = std::unique_ptr<RecheckBucketInfoReply>;
 
     explicit RecheckBucketInfoReply(const RecheckBucketInfoCommand& cmd);
     ~RecheckBucketInfoReply() override;
@@ -206,8 +206,8 @@ public:
     };
 
     static constexpr uint32_t ID = 1009;
-    typedef std::shared_ptr<AbortBucketOperationsCommand> SP;
-    typedef std::shared_ptr<const AbortBucketOperationsCommand> CSP;
+    using SP = std::shared_ptr<AbortBucketOperationsCommand>;
+    using CSP = std::shared_ptr<const AbortBucketOperationsCommand>;
 private:
     std::unique_ptr<AbortPredicate> _predicate;
 public:
@@ -227,8 +227,8 @@ class AbortBucketOperationsReply : public api::InternalReply
 {
 public:
     static constexpr uint32_t ID = 1010;
-    typedef std::shared_ptr<AbortBucketOperationsReply> SP;
-    typedef std::shared_ptr<const AbortBucketOperationsReply> CSP;
+    using SP = std::shared_ptr<AbortBucketOperationsReply>;
+    using CSP = std::shared_ptr<const AbortBucketOperationsReply>;
 
     explicit AbortBucketOperationsReply(const AbortBucketOperationsCommand& cmd);
     ~AbortBucketOperationsReply() override;
diff --git a/storage/src/vespa/storage/persistence/splitjoinhandler.cpp b/storage/src/vespa/storage/persistence/splitjoinhandler.cpp
index f86a65efd91..51fa1f1b785 100644
--- a/storage/src/vespa/storage/persistence/splitjoinhandler.cpp
+++ b/storage/src/vespa/storage/persistence/splitjoinhandler.cpp
@@ -81,7 +81,7 @@ SplitJoinHandler::handleSplitBucket(api::SplitBucketCommand& cmd, MessageTracker
     api::SplitBucketReply & splitReply = *reply;
     tracker->setReply(std::move(reply));
 
-    typedef std::pair<StorBucketDatabase::WrappedEntry, FileStorHandler::RemapInfo> TargetInfo;
+    using TargetInfo = std::pair<StorBucketDatabase::WrappedEntry, FileStorHandler::RemapInfo>;
     std::vector<TargetInfo> targets;
     for (uint32_t i = 0; i < 2; i++) {
         const document::Bucket &target(i == 0 ? target1 : target2);
diff --git a/storage/src/vespa/storage/persistence/types.h b/storage/src/vespa/storage/persistence/types.h
index da004f85075..60de7dea4fd 100644
--- a/storage/src/vespa/storage/persistence/types.h
+++ b/storage/src/vespa/storage/persistence/types.h
@@ -15,12 +15,12 @@ namespace storage {
 class MessageTracker;
 
 struct Types {
-    typedef document::BucketId BucketId;
-    typedef document::DocumentId DocumentId;
-    typedef document::GlobalId GlobalId;
-    typedef framework::MicroSecTime Timestamp;
-    typedef vespalib::string String;
-    typedef api::BucketInfo BucketInfo;
+    using BucketId = document::BucketId;
+    using DocumentId = document::DocumentId;
+    using GlobalId = document::GlobalId;
+    using Timestamp = framework::MicroSecTime;
+    using String = vespalib::string;
+    using BucketInfo = api::BucketInfo;
     using MessageTrackerUP = std::unique_ptr<MessageTracker>;
 protected:
     ~Types() {} // Noone should refer to objects as Types objects
diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
index 4458bf8a92d..fff40250d41 100644
--- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp
+++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp
@@ -151,7 +151,7 @@ CommunicationManager::handleReply(std::unique_ptr<mbus::Reply> reply)
             std::shared_ptr<api::StorageCommand> originalCommand;
             {
                 std::lock_guard lock(_messageBusSentLock);
-                typedef std::map<api::StorageMessage::Id, api::StorageCommand::SP> MessageMap;
+                using MessageMap = std::map<api::StorageMessage::Id, api::StorageCommand::SP>;
                 MessageMap::iterator iter(_messageBusSent.find(reply->getContext().value.UINT64));
                 if (iter != _messageBusSent.end()) {
                     originalCommand.swap(iter->second);
diff --git a/storage/src/vespa/storage/storageserver/distributornode.h b/storage/src/vespa/storage/storageserver/distributornode.h
index 8d36d1d8bc5..7224abfa59c 100644
--- a/storage/src/vespa/storage/storageserver/distributornode.h
+++ b/storage/src/vespa/storage/storageserver/distributornode.h
@@ -41,7 +41,7 @@ class DistributorNode
     constexpr static uint32_t SanityCheckMaxWallClockSecondSkew = 120;
 
 public:
-    typedef std::unique_ptr<DistributorNode> UP;
+    using UP = std::unique_ptr<DistributorNode>;
 
     DistributorNode(const config::ConfigUri & configUri,
                     DistributorNodeContext&,
diff --git a/storage/src/vespa/storage/storageserver/distributornodecontext.h b/storage/src/vespa/storage/storageserver/distributornodecontext.h
index b00274431ad..d01127827e0 100644
--- a/storage/src/vespa/storage/storageserver/distributornodecontext.h
+++ b/storage/src/vespa/storage/storageserver/distributornodecontext.h
@@ -19,7 +19,7 @@ namespace storage {
 
 struct DistributorNodeContext : public StorageNodeContext {
     // Typedefs to simplify the remainder of the interface
-    typedef DistributorComponentRegisterImpl ComponentRegister;
+    using ComponentRegister = DistributorComponentRegisterImpl;
 
     /**
      * You can provide your own clock implementation. Useful in testing where
diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.h b/storage/src/vespa/storage/storageserver/priorityconverter.h
index b1f774e4ff2..0abfccac3ea 100644
--- a/storage/src/vespa/storage/storageserver/priorityconverter.h
+++ b/storage/src/vespa/storage/storageserver/priorityconverter.h
@@ -21,7 +21,7 @@ class PriorityConverter
                 vespa::config::content::core::StorPrioritymappingConfig>
 {
 public:
-    typedef vespa::config::content::core::StorPrioritymappingConfig Config;
+    using Config = vespa::config::content::core::StorPrioritymappingConfig;
 
     explicit PriorityConverter(const config::ConfigUri& configUri);
     ~PriorityConverter() override;
diff --git a/storage/src/vespa/storage/storageserver/servicelayernode.h b/storage/src/vespa/storage/storageserver/servicelayernode.h
index 4b0e0f73408..4f4af71ef57 100644
--- a/storage/src/vespa/storage/storageserver/servicelayernode.h
+++ b/storage/src/vespa/storage/storageserver/servicelayernode.h
@@ -37,7 +37,7 @@ class ServiceLayerNode
     bool _init_has_been_called;
 
 public:
-    typedef std::unique_ptr<ServiceLayerNode> UP;
+    using UP = std::unique_ptr<ServiceLayerNode>;
 
     ServiceLayerNode(const config::ConfigUri & configUri,
                      ServiceLayerNodeContext& context,
diff --git a/storage/src/vespa/storage/storageserver/servicelayernodecontext.h b/storage/src/vespa/storage/storageserver/servicelayernodecontext.h
index 79bc0b2c3ae..d89ba472f83 100644
--- a/storage/src/vespa/storage/storageserver/servicelayernodecontext.h
+++ b/storage/src/vespa/storage/storageserver/servicelayernodecontext.h
@@ -19,7 +19,7 @@ namespace storage {
 
 struct ServiceLayerNodeContext : public StorageNodeContext {
     // Typedefs to simplify the remainder of the interface
-    typedef ServiceLayerComponentRegisterImpl ComponentRegister;
+    using ComponentRegister = ServiceLayerComponentRegisterImpl;
 
     /**
      * You can provide your own clock implementation. Useful in testing where
diff --git a/storage/src/vespa/storage/storageserver/storagenodecontext.h b/storage/src/vespa/storage/storageserver/storagenodecontext.h
index 91953e7092f..c89bb4630ce 100644
--- a/storage/src/vespa/storage/storageserver/storagenodecontext.h
+++ b/storage/src/vespa/storage/storageserver/storagenodecontext.h
@@ -20,8 +20,8 @@ namespace storage {
 
 struct StorageNodeContext {
     // Typedefs to simplify the remainder of the interface
-    typedef StorageComponentRegisterImpl ComponentRegister;
-    typedef framework::defaultimplementation::RealClock RealClock;
+    using ComponentRegister = StorageComponentRegisterImpl;
+    using RealClock = framework::defaultimplementation::RealClock;
 
     /**
      * Get the actual component register. Available as the actual type as the
diff --git a/storage/src/vespa/storage/visiting/commandqueue.h b/storage/src/vespa/storage/visiting/commandqueue.h
index 4d948051b32..c9c34b7b4e0 100644
--- a/storage/src/vespa/storage/visiting/commandqueue.h
+++ b/storage/src/vespa/storage/visiting/commandqueue.h
@@ -75,11 +75,11 @@ private:
     std::atomic<size_t>     _cached_size;
 
 public:
-    typedef typename CommandList::iterator iterator;
-    typedef typename CommandList::reverse_iterator reverse_iterator;
-    typedef typename CommandList::const_iterator const_iterator;
-    typedef typename CommandList::const_reverse_iterator const_reverse_iterator;
-    typedef typename timelist::const_iterator const_titerator;
+    using iterator = typename CommandList::iterator;
+    using reverse_iterator = typename CommandList::reverse_iterator;
+    using const_iterator = typename CommandList::const_iterator;
+    using const_reverse_iterator = typename CommandList::const_reverse_iterator;
+    using const_titerator = typename timelist::const_iterator;
 
     explicit CommandQueue(const framework::Clock& clock)
         : _clock(clock),
diff --git a/storage/src/vespa/storage/visiting/countvisitor.h b/storage/src/vespa/storage/visiting/countvisitor.h
index 4120a96225f..8ae67a5e0d2 100644
--- a/storage/src/vespa/storage/visiting/countvisitor.h
+++ b/storage/src/vespa/storage/visiting/countvisitor.h
@@ -29,14 +29,14 @@ private:
     std::map<std::string, int> _schemeCount;
 
     bool _doNamespace;
-    typedef std::map<vespalib::string, int> NamespaceCountMap;
+    using NamespaceCountMap = std::map<vespalib::string, int>;
     NamespaceCountMap _namespaceCount;
 
     bool _doUser;
     std::map<uint64_t, int> _userCount;
 
     bool _doGroup;
-    typedef std::map<vespalib::string, int> GroupCountMap;
+    using GroupCountMap = std::map<vespalib::string, int>;
     GroupCountMap _groupCount;
 };
 
diff --git a/storage/src/vespa/storage/visiting/messagebusvisitormessagesession.h b/storage/src/vespa/storage/visiting/messagebusvisitormessagesession.h
index ea9aa1f166e..a5670c637f8 100644
--- a/storage/src/vespa/storage/visiting/messagebusvisitormessagesession.h
+++ b/storage/src/vespa/storage/visiting/messagebusvisitormessagesession.h
@@ -21,7 +21,7 @@ class MessageBusVisitorMessageSession : public VisitorMessageSession,
                                         public mbus::IReplyHandler
 {
 public:
-    typedef std::unique_ptr<MessageBusVisitorMessageSession> UP;
+    using UP = std::unique_ptr<MessageBusVisitorMessageSession>;
 
     MessageBusVisitorMessageSession(Visitor& visitor, VisitorThread& thread)
         : _visitor(visitor),
diff --git a/storage/src/vespa/storage/visiting/visitor.h b/storage/src/vespa/storage/visiting/visitor.h
index aa1c34d10b7..0737c5612c0 100644
--- a/storage/src/vespa/storage/visiting/visitor.h
+++ b/storage/src/vespa/storage/visiting/visitor.h
@@ -233,7 +233,7 @@ private:
 
         // Maps from time sent to message to send.
         // Value refers to message id (key in _messageMeta).
-        typedef std::multimap<framework::MicroSecTime, uint64_t> MessageQueue;
+        using MessageQueue = std::multimap<framework::MicroSecTime, uint64_t>;
 
         MessageQueue _queuedMessages;
 
@@ -273,7 +273,7 @@ private:
     // The iterator iterating the buckets to visit.
     uint32_t _currentBucket;
     // The states of the buckets currently being visited.
-    typedef std::list<BucketIterationState*> BucketStateList;
+    using BucketStateList = std::list<BucketIterationState*>;
     BucketStateList _bucketStates;
     // Set to true after performing given callbacks
     bool _calledStartingVisitor;
diff --git a/storage/src/vespa/storage/visiting/visitormanager.cpp b/storage/src/vespa/storage/visiting/visitormanager.cpp
index 759f1f1f059..9c9a39ff28c 100644
--- a/storage/src/vespa/storage/visiting/visitormanager.cpp
+++ b/storage/src/vespa/storage/visiting/visitormanager.cpp
@@ -207,7 +207,7 @@ void
 VisitorManager::run(framework::ThreadHandle& thread)
 {
     LOG(debug, "Started visitor manager thread with pid %d.", getpid());
-    typedef CommandQueue<api::CreateVisitorCommand> CQ;
+    using CQ = CommandQueue<api::CreateVisitorCommand>;
     std::vector<CQ::CommandEntry> timedOut;
     // Run forever, dump messages in the visitor queue that times out.
     while (true) {
diff --git a/storage/src/vespa/storage/visiting/visitormessagesession.h b/storage/src/vespa/storage/visiting/visitormessagesession.h
index fc11c1dee81..0fefbcb067f 100644
--- a/storage/src/vespa/storage/visiting/visitormessagesession.h
+++ b/storage/src/vespa/storage/visiting/visitormessagesession.h
@@ -13,7 +13,7 @@ namespace documentapi {
 namespace storage {
 
 struct VisitorMessageSession {
-    typedef std::unique_ptr<VisitorMessageSession> UP;
+    using UP = std::unique_ptr<VisitorMessageSession>;
 
     virtual ~VisitorMessageSession() {}
 
diff --git a/storage/src/vespa/storage/visiting/visitormessagesessionfactory.h b/storage/src/vespa/storage/visiting/visitormessagesessionfactory.h
index 683588f19ab..1b0bfc23f63 100644
--- a/storage/src/vespa/storage/visiting/visitormessagesessionfactory.h
+++ b/storage/src/vespa/storage/visiting/visitormessagesessionfactory.h
@@ -11,7 +11,7 @@ class Visitor;
 class VisitorThread;
 
 struct VisitorMessageSessionFactory {
-    typedef std::unique_ptr<VisitorMessageSessionFactory> UP;
+    using UP = std::unique_ptr<VisitorMessageSessionFactory>;
 
     virtual ~VisitorMessageSessionFactory() = default;
 
diff --git a/storage/src/vespa/storageapi/mbusprot/protocolserialization.h b/storage/src/vespa/storageapi/mbusprot/protocolserialization.h
index 653e9ded85a..0daf04c75c6 100644
--- a/storage/src/vespa/storageapi/mbusprot/protocolserialization.h
+++ b/storage/src/vespa/storageapi/mbusprot/protocolserialization.h
@@ -70,12 +70,12 @@ protected:
     ProtocolSerialization() = default;
     virtual ~ProtocolSerialization() = default;
 
-    typedef api::StorageCommand SCmd;
-    typedef api::StorageReply SRep;
-    typedef document::ByteBuffer BBuf;
-    typedef vespalib::GrowableByteBuffer GBBuf;
-    typedef SerializationHelper SH;
-    typedef StorageMessage SM;
+    using SCmd = api::StorageCommand;
+    using SRep = api::StorageReply;
+    using BBuf = document::ByteBuffer;
+    using GBBuf = vespalib::GrowableByteBuffer;
+    using SH = SerializationHelper;
+    using SM = StorageMessage;
 
     virtual void onEncode(GBBuf&, const api::PutCommand&) const = 0;
     virtual void onEncode(GBBuf&, const api::PutReply&) const = 0;
diff --git a/storage/src/vespa/storageapi/mbusprot/storagecommand.h b/storage/src/vespa/storageapi/mbusprot/storagecommand.h
index e65c0295e31..09f01fe4fac 100644
--- a/storage/src/vespa/storageapi/mbusprot/storagecommand.h
+++ b/storage/src/vespa/storageapi/mbusprot/storagecommand.h
@@ -10,7 +10,7 @@ namespace storage::mbusprot {
 
 class StorageCommand : public mbus::Message, public StorageMessage {
 public:
-    typedef std::unique_ptr<StorageCommand> UP;
+    using UP = std::unique_ptr<StorageCommand>;
 
     explicit StorageCommand(api::StorageCommand::SP);
 
diff --git a/storage/src/vespa/storageapi/mbusprot/storagemessage.h b/storage/src/vespa/storageapi/mbusprot/storagemessage.h
index 61323222b89..4a7a18ce355 100644
--- a/storage/src/vespa/storageapi/mbusprot/storagemessage.h
+++ b/storage/src/vespa/storageapi/mbusprot/storagemessage.h
@@ -7,7 +7,7 @@ namespace storage::mbusprot {
 
 class StorageMessage {
 public:
-    typedef std::unique_ptr<StorageMessage> UP;
+    using UP = std::unique_ptr<StorageMessage>;
 
     virtual ~StorageMessage() {}
 
diff --git a/storage/src/vespa/storageapi/mbusprot/storageprotocol.h b/storage/src/vespa/storageapi/mbusprot/storageprotocol.h
index dbea21a4a9f..aae0754db49 100644
--- a/storage/src/vespa/storageapi/mbusprot/storageprotocol.h
+++ b/storage/src/vespa/storageapi/mbusprot/storageprotocol.h
@@ -9,7 +9,7 @@ namespace storage::mbusprot {
 class StorageProtocol final : public mbus::IProtocol
 {
 public:
-    typedef std::shared_ptr<StorageProtocol> SP;
+    using SP = std::shared_ptr<StorageProtocol>;
 
     static mbus::string NAME;
 
diff --git a/storage/src/vespa/storageapi/mbusprot/storagereply.h b/storage/src/vespa/storageapi/mbusprot/storagereply.h
index 538b7caa678..714a3affacb 100644
--- a/storage/src/vespa/storageapi/mbusprot/storagereply.h
+++ b/storage/src/vespa/storageapi/mbusprot/storagereply.h
@@ -16,7 +16,7 @@ class StorageReply : public mbus::Reply, public StorageMessage {
     mutable api::StorageReply::SP _reply;
 
 public:
-    typedef std::unique_ptr<StorageReply> UP;
+    using UP = std::unique_ptr<StorageReply>;
 
     StorageReply(mbus::BlobRef data, const ProtocolSerialization&);
     StorageReply(api::StorageReply::SP reply);
diff --git a/storage/src/vespa/storageapi/message/bucket.h b/storage/src/vespa/storageapi/message/bucket.h
index ab61a9202c8..57eed20f665 100644
--- a/storage/src/vespa/storageapi/message/bucket.h
+++ b/storage/src/vespa/storageapi/message/bucket.h
@@ -154,7 +154,7 @@ operator<<(std::ostream& out, const MergeBucketCommand::Node& n);
  */
 class MergeBucketReply : public BucketReply {
 public:
-    typedef MergeBucketCommand::Node Node;
+    using Node = MergeBucketCommand::Node;
 
 private:
     std::vector<Node> _nodes;
@@ -182,7 +182,7 @@ public:
  */
 class GetBucketDiffCommand : public BucketCommand {
 public:
-    typedef MergeBucketCommand::Node Node;
+    using Node = MergeBucketCommand::Node;
 
     struct Entry : public document::Printable {
         Timestamp _timestamp;
@@ -227,8 +227,8 @@ public:
  */
 class GetBucketDiffReply : public BucketReply {
 public:
-    typedef MergeBucketCommand::Node Node;
-    typedef GetBucketDiffCommand::Entry Entry;
+    using Node = MergeBucketCommand::Node;
+    using Entry = GetBucketDiffCommand::Entry;
 
 private:
     std::vector<Node> _nodes;
@@ -257,7 +257,7 @@ public:
  */
 class ApplyBucketDiffCommand : public BucketInfoCommand {
 public:
-    typedef MergeBucketCommand::Node Node;
+    using Node = MergeBucketCommand::Node;
     struct Entry : public document::Printable {
         GetBucketDiffCommand::Entry _entry;
         vespalib::string _docName;
@@ -304,8 +304,8 @@ public:
  */
 class ApplyBucketDiffReply : public BucketInfoReply {
 public:
-    typedef MergeBucketCommand::Node Node;
-    typedef ApplyBucketDiffCommand::Entry Entry;
+    using Node = MergeBucketCommand::Node;
+    using Entry = ApplyBucketDiffCommand::Entry;
 
 private:
     std::vector<Node> _nodes;
diff --git a/storage/src/vespa/storageapi/message/bucketsplitting.h b/storage/src/vespa/storageapi/message/bucketsplitting.h
index 584cdfd5638..bf589b62b5b 100644
--- a/storage/src/vespa/storageapi/message/bucketsplitting.h
+++ b/storage/src/vespa/storageapi/message/bucketsplitting.h
@@ -69,7 +69,7 @@ public:
  */
 class SplitBucketReply : public BucketReply {
 public:
-    typedef std::pair<document::BucketId, BucketInfo> Entry;
+    using Entry = std::pair<document::BucketId, BucketInfo>;
     explicit SplitBucketReply(const SplitBucketCommand& cmd);
     std::vector<Entry>& getSplitInfo() { return _result; }
     const std::vector<Entry>& getSplitInfo() const { return _result; }
diff --git a/storage/src/vespa/storageapi/messageapi/returncode.h b/storage/src/vespa/storageapi/messageapi/returncode.h
index f60cbe2b840..ed06891ffc9 100644
--- a/storage/src/vespa/storageapi/messageapi/returncode.h
+++ b/storage/src/vespa/storageapi/messageapi/returncode.h
@@ -17,7 +17,7 @@ namespace storage::api {
 
 class ReturnCode {
 public:
-    typedef documentapi::DocumentProtocol Protocol;
+    using Protocol = documentapi::DocumentProtocol;
 
     /** Return status codes */
     enum Result {
diff --git a/storage/src/vespa/storageapi/messageapi/storagemessage.h b/storage/src/vespa/storageapi/messageapi/storagemessage.h
index 71567192bd9..6990423295b 100644
--- a/storage/src/vespa/storageapi/messageapi/storagemessage.h
+++ b/storage/src/vespa/storageapi/messageapi/storagemessage.h
@@ -29,9 +29,9 @@ namespace vespalib { class asciistream; }
  * Adds a messagehandler callback and some utilities
  */
 #define DECLARE_POINTER_TYPEDEFS(message) \
-    typedef std::unique_ptr<message> UP; \
-    typedef std::shared_ptr<message> SP; \
-    typedef std::shared_ptr<const message> CSP;
+    using UP = std::unique_ptr<message>; \
+    using SP = std::shared_ptr<message>; \
+    using CSP = std::shared_ptr<const message>;
 
 #define DECLARE_STORAGEREPLY(reply, callback) \
 public: \
@@ -339,8 +339,8 @@ class StorageMessage : public vespalib::Printable
     friend class StorageMessageTest; // Used for testing only
 public:
     DECLARE_POINTER_TYPEDEFS(StorageMessage);
-    typedef uint64_t Id;
-    typedef uint8_t Priority;
+    using Id = uint64_t;
+    using Priority = uint8_t;
 
     enum LegacyPriorityValues {
         LOW = 225,
diff --git a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
index 6cfae8086fc..8cd4f87c404 100644
--- a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
+++ b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h
@@ -55,7 +55,7 @@ class ComponentRegisterImpl : public virtual ComponentRegister,
     ShutdownListener* _shutdownListener;
 
 public:
-    typedef std::unique_ptr<ComponentRegisterImpl> UP;
+    using UP = std::unique_ptr<ComponentRegisterImpl>;
 
     ComponentRegisterImpl();
     ~ComponentRegisterImpl() override;
diff --git a/storage/src/vespa/storageframework/generic/thread/thread.h b/storage/src/vespa/storageframework/generic/thread/thread.h
index 444376b87a5..6be65667b0f 100644
--- a/storage/src/vespa/storageframework/generic/thread/thread.h
+++ b/storage/src/vespa/storageframework/generic/thread/thread.h
@@ -30,7 +30,7 @@ class Thread : public ThreadHandle {
     vespalib::string _id;
 
 public:
-    typedef std::unique_ptr<Thread> UP;
+    using UP = std::unique_ptr<Thread>;
 
     Thread(vespalib::stringref id) : _id(id) {}
     virtual ~Thread() = default;
diff --git a/storage/src/vespa/storageframework/generic/thread/tickingthread.cpp b/storage/src/vespa/storageframework/generic/thread/tickingthread.cpp
index 1a9cb459f28..9045e989c27 100644
--- a/storage/src/vespa/storageframework/generic/thread/tickingthread.cpp
+++ b/storage/src/vespa/storageframework/generic/thread/tickingthread.cpp
@@ -30,7 +30,7 @@ class TickingThreadRunner final : public Runnable {
     char                      _state;
 
 public:
-    typedef std::shared_ptr<TickingThreadRunner> SP;
+    using SP = std::shared_ptr<TickingThreadRunner>;
 
     TickingThreadRunner(std::mutex& m,
                         std::condition_variable & cond,