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

5 files changed, 10 insertions, 10 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;