diff options
8 files changed, 10 insertions, 10 deletions
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp index fac6b0562a3..8698e44bef5 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp @@ -90,8 +90,8 @@ createClusterState(const lib::State& nodeState = lib::State::UP) using storage::lib::NodeType; using storage::lib::State; using vespa::config::content::StorDistributionConfigBuilder; - typedef StorDistributionConfigBuilder::Group Group; - typedef Group::Nodes Nodes; + using Group = StorDistributionConfigBuilder::Group; + using Nodes = Group::Nodes; storage::lib::ClusterState cstate; StorDistributionConfigBuilder dc; diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.h b/persistence/src/vespa/persistence/conformancetest/conformancetest.h index 57c67bbb641..da779e1587b 100644 --- a/persistence/src/vespa/persistence/conformancetest/conformancetest.h +++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.h @@ -27,7 +27,7 @@ class ConformanceTest : public ::testing::Test { public: using PersistenceProviderUP = std::unique_ptr<PersistenceProvider>; struct PersistenceFactory { - typedef std::unique_ptr<PersistenceFactory> UP; + using UP = std::unique_ptr<PersistenceFactory>; virtual ~PersistenceFactory() = default; virtual PersistenceProviderUP getPersistenceImplementation( diff --git a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp index ccdbf01a81f..7f2b553e19d 100644 --- a/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp +++ b/persistence/src/vespa/persistence/dummyimpl/dummypersistence.cpp @@ -578,7 +578,7 @@ DummyPersistence::createIterator(const Bucket &b, FieldSetSP fs, const Selection const BucketContent::GidMapType& gidMap((*bc)->_gidMap); if (s.getTimestampSubset().empty()) { - typedef std::vector<BucketEntry>::const_reverse_iterator reverse_iterator; + using reverse_iterator = std::vector<BucketEntry>::const_reverse_iterator; for (reverse_iterator entryIter((*bc)->_entries.rbegin()), entryEnd((*bc)->_entries.rend()); entryIter != entryEnd; ++entryIter) diff --git a/persistence/src/vespa/persistence/spi/clusterstate.h b/persistence/src/vespa/persistence/spi/clusterstate.h index bde7e5bdbf4..0f073e3a553 100644 --- a/persistence/src/vespa/persistence/spi/clusterstate.h +++ b/persistence/src/vespa/persistence/spi/clusterstate.h @@ -19,7 +19,7 @@ class Bucket; */ class ClusterState { public: - typedef std::shared_ptr<ClusterState> SP; + using SP = std::shared_ptr<ClusterState>; ClusterState(const lib::ClusterState& state, uint16_t nodeIndex, diff --git a/persistence/src/vespa/persistence/spi/context.h b/persistence/src/vespa/persistence/spi/context.h index ab55f0d1844..4b90641d35d 100644 --- a/persistence/src/vespa/persistence/spi/context.h +++ b/persistence/src/vespa/persistence/spi/context.h @@ -34,11 +34,11 @@ namespace storage::spi { -typedef uint16_t Priority; // 0 - max pri, 255 - min pri +using Priority = uint16_t; // 0 - max pri, 255 - min pri // Define this type just because a ton of tests currently use it. struct Trace { - typedef int TraceLevel; + using TraceLevel = int; }; class Context { diff --git a/persistence/src/vespa/persistence/spi/result.h b/persistence/src/vespa/persistence/spi/result.h index 5046a380c86..54fc52f5234 100644 --- a/persistence/src/vespa/persistence/spi/result.h +++ b/persistence/src/vespa/persistence/spi/result.h @@ -11,7 +11,7 @@ class DocEntry; class Result { public: - typedef std::unique_ptr<Result> UP; + using UP = std::unique_ptr<Result>; enum class ErrorType { NONE, diff --git a/persistence/src/vespa/persistence/spi/selection.h b/persistence/src/vespa/persistence/spi/selection.h index 4f6d9f9a61f..8a476b585ff 100644 --- a/persistence/src/vespa/persistence/spi/selection.h +++ b/persistence/src/vespa/persistence/spi/selection.h @@ -15,7 +15,7 @@ namespace storage::spi { class Selection { public: - typedef std::vector<Timestamp> TimestampSubset; + using TimestampSubset = std::vector<Timestamp>; private: DocumentSelection _documentSelection; Timestamp _fromTimestamp; diff --git a/persistence/src/vespa/persistence/spi/types.h b/persistence/src/vespa/persistence/spi/types.h index a75b977c14a..33280df72f9 100644 --- a/persistence/src/vespa/persistence/spi/types.h +++ b/persistence/src/vespa/persistence/spi/types.h @@ -27,7 +27,7 @@ namespace document { class name { \ type _value; \ public: \ - typedef type Type; \ + using Type = type; \ name() noexcept : _value() {} \ explicit name(type v) noexcept : _value(v) {} \ operator type() const noexcept { return _value; } \ |