diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-12-21 14:28:50 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-12-21 15:49:53 +0000 |
commit | 851403d8631849554b0b7d408d942e729fba9267 (patch) | |
tree | 896ce90d0ef45136e8b0b087dfcfd33f038cddd0 /documentapi | |
parent | 90393771da4a397562db57756cc9ca7b6bdca3fd (diff) |
Change from typedef to using in documentapi C++ code.
Diffstat (limited to 'documentapi')
24 files changed, 49 insertions, 49 deletions
diff --git a/documentapi/src/tests/policies/testframe.h b/documentapi/src/tests/policies/testframe.h index 7cb3b830627..3b2af060a45 100644 --- a/documentapi/src/tests/policies/testframe.h +++ b/documentapi/src/tests/policies/testframe.h @@ -24,7 +24,7 @@ public: /** * Convenience typedefs. */ - typedef std::map<string, uint32_t> ReplyMap; + using ReplyMap = std::map<string, uint32_t>; /** * Create a named test frame. diff --git a/documentapi/src/vespa/documentapi/common.h b/documentapi/src/vespa/documentapi/common.h index dfc29f48317..13d67318a05 100644 --- a/documentapi/src/vespa/documentapi/common.h +++ b/documentapi/src/vespa/documentapi/common.h @@ -6,7 +6,7 @@ namespace documentapi { // Decide the type of string used once -typedef vespalib::string string; +using string = vespalib::string; } // namespace mbus diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h index f55c05f72cd..9f0d7253335 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h @@ -32,8 +32,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<DocumentProtocol> UP; - typedef std::shared_ptr<DocumentProtocol> SP; + using UP = std::unique_ptr<DocumentProtocol>; + using SP = std::shared_ptr<DocumentProtocol>; /** * The name of this protocol is public static so it can be referenced by all of this protocol's messages diff --git a/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h b/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h index d7e60882539..cb1a046107a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h +++ b/documentapi/src/vespa/documentapi/messagebus/iroutablefactory.h @@ -25,8 +25,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IRoutableFactory> UP; - typedef std::shared_ptr<IRoutableFactory> SP; + using UP = std::unique_ptr<IRoutableFactory>; + using SP = std::shared_ptr<IRoutableFactory>; IRoutableFactory(const IRoutableFactory &) = delete; IRoutableFactory & operator = (const IRoutableFactory &) = delete; diff --git a/documentapi/src/vespa/documentapi/messagebus/iroutingpolicyfactory.h b/documentapi/src/vespa/documentapi/messagebus/iroutingpolicyfactory.h index 77e5ad7c33b..c2098608c3a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/iroutingpolicyfactory.h +++ b/documentapi/src/vespa/documentapi/messagebus/iroutingpolicyfactory.h @@ -16,8 +16,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IRoutingPolicyFactory> UP; - typedef std::shared_ptr<IRoutingPolicyFactory> SP; + using UP = std::unique_ptr<IRoutingPolicyFactory>; + using SP = std::shared_ptr<IRoutingPolicyFactory>; /** * Virtual destructor required for inheritance. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentignoredreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentignoredreply.h index a97f49abe99..b766a1f5459 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentignoredreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentignoredreply.h @@ -7,8 +7,8 @@ namespace documentapi { class DocumentIgnoredReply : public DocumentReply { public: - typedef std::unique_ptr<DocumentIgnoredReply> UP; - typedef std::shared_ptr<DocumentIgnoredReply> SP; + using UP = std::unique_ptr<DocumentIgnoredReply>; + using SP = std::shared_ptr<DocumentIgnoredReply>; DocumentIgnoredReply(); diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h index 71ca7b049de..09a565c5ea8 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h @@ -24,8 +24,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<DocumentMessage> UP; - typedef std::shared_ptr<DocumentMessage> SP; + using UP = std::unique_ptr<DocumentMessage>; + using SP = std::shared_ptr<DocumentMessage>; DocumentMessage(); ~DocumentMessage() override; diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h index 0b137ba7fbc..d03a1447753 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentreply.h @@ -19,8 +19,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<DocumentReply> UP; - typedef std::shared_ptr<DocumentReply> SP; + using UP = std::unique_ptr<DocumentReply>; + using SP = std::shared_ptr<DocumentReply>; /** * Constructs a new reply of given type. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h index b978bc51248..2c8149ab058 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h @@ -16,8 +16,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<DocumentSummaryMessage> UP; - typedef std::shared_ptr<DocumentSummaryMessage> SP; + using UP = std::unique_ptr<DocumentSummaryMessage>; + using SP = std::shared_ptr<DocumentSummaryMessage>; /** * Constructs a new document message with no content. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/feedmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/feedmessage.h index 0cf4ae0f412..ab95b84fac9 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/feedmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/feedmessage.h @@ -15,8 +15,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<FeedMessage> UP; - typedef std::shared_ptr<FeedMessage> SP; + using UP = std::unique_ptr<FeedMessage>; + using SP = std::shared_ptr<FeedMessage>; public: /** diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/feedreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/feedreply.h index ec2fccd65a0..730737e84c7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/feedreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/feedreply.h @@ -14,8 +14,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<FeedReply> UP; - typedef std::shared_ptr<FeedReply> SP; + using UP = std::unique_ptr<FeedReply>; + using SP = std::shared_ptr<FeedReply>; /** * Constructs a new reply for deserialization. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h index 497bde947bc..666d8009dce 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentmessage.h @@ -18,8 +18,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<GetDocumentMessage> UP; - typedef std::shared_ptr<GetDocumentMessage> SP; + using UP = std::unique_ptr<GetDocumentMessage>; + using SP = std::shared_ptr<GetDocumentMessage>; /** * Constructs a new message for deserialization. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h index 06558e2bbf4..54fb8d6dac2 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/getdocumentreply.h @@ -17,8 +17,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<GetDocumentReply> UP; - typedef std::shared_ptr<GetDocumentReply> SP; + using UP = std::unique_ptr<GetDocumentReply>; + using SP = std::shared_ptr<GetDocumentReply>; /** * Constructs a new reply for deserialization. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h index 3c316df50fe..561fc909e86 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h @@ -18,8 +18,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<QueryResultMessage> UP; - typedef std::shared_ptr<QueryResultMessage> SP; + using UP = std::unique_ptr<QueryResultMessage>; + using SP = std::shared_ptr<QueryResultMessage>; /** * Constructs a new search result message for deserialization. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h index 1d6760beeae..665eb4aa71a 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.h @@ -18,8 +18,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<RemoveDocumentMessage> UP; - typedef std::shared_ptr<RemoveDocumentMessage> SP; + using UP = std::unique_ptr<RemoveDocumentMessage>; + using SP = std::shared_ptr<RemoveDocumentMessage>; /** * Constructs a new remove document message with no content. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h index 6e831b5f53e..5ed254343bb 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h @@ -13,8 +13,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<RemoveDocumentReply> UP; - typedef std::shared_ptr<RemoveDocumentReply> SP; + using UP = std::unique_ptr<RemoveDocumentReply>; + using SP = std::shared_ptr<RemoveDocumentReply>; public: /** diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h index ad8a4cb6e7d..a464aa6218b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h @@ -15,8 +15,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<SearchResultMessage> UP; - typedef std::shared_ptr<SearchResultMessage> SP; + using UP = std::unique_ptr<SearchResultMessage>; + using SP = std::shared_ptr<SearchResultMessage>; /** * Constructs a new search result message for deserialization. diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h index 64f34e43519..29aa358c815 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/updatedocumentreply.h @@ -13,8 +13,8 @@ public: /** * Convenience typedef. */ - typedef std::unique_ptr<UpdateDocumentReply> UP; - typedef std::shared_ptr<UpdateDocumentReply> SP; + using UP = std::unique_ptr<UpdateDocumentReply>; + using SP = std::shared_ptr<UpdateDocumentReply>; public: /** diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h index 0b43b37c0b7..234c4ce1812 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h @@ -13,7 +13,7 @@ namespace document { class Document; } namespace documentapi { -typedef uint64_t Timestamp; +using Timestamp = uint64_t; /** * @class CreateVisitorMessage @@ -44,7 +44,7 @@ protected: DocumentReply::UP doCreateReply() const override; public: - typedef std::unique_ptr<CreateVisitorMessage> UP; + using UP = std::unique_ptr<CreateVisitorMessage>; CreateVisitorMessage(); // must be deserialized into CreateVisitorMessage(const string& libraryName, @@ -123,7 +123,7 @@ protected: DocumentReply::UP doCreateReply() const override; public: - typedef std::unique_ptr<DestroyVisitorMessage> UP; + using UP = std::unique_ptr<DestroyVisitorMessage>; DestroyVisitorMessage(); // must be deserialized into DestroyVisitorMessage(const string &instanceId); @@ -189,7 +189,7 @@ protected: DocumentReply::UP doCreateReply() const override; public: - typedef std::unique_ptr<VisitorInfoMessage> UP; + using UP = std::unique_ptr<VisitorInfoMessage>; VisitorInfoMessage(); ~VisitorInfoMessage(); @@ -218,7 +218,7 @@ protected: DocumentReply::UP doCreateReply() const override; public: - typedef std::unique_ptr<MapVisitorMessage> UP; + using UP = std::unique_ptr<MapVisitorMessage>; MapVisitorMessage(); diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h index 36a48ba1cca..812e7df8bc7 100644 --- a/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h +++ b/documentapi/src/vespa/documentapi/messagebus/messages/wrongdistributionreply.h @@ -10,8 +10,8 @@ private: string _systemState; public: - typedef std::unique_ptr<WrongDistributionReply> UP; - typedef std::shared_ptr<WrongDistributionReply> SP; + using UP = std::unique_ptr<WrongDistributionReply>; + using SP = std::shared_ptr<WrongDistributionReply>; WrongDistributionReply(); WrongDistributionReply(const string &systemState); diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h index 8512984766e..ff34ade5bc0 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/documentrouteselectorpolicy.h @@ -33,8 +33,8 @@ class DocumentRouteSelectorPolicy : public mbus::IRoutingPolicy, public config::IFetcherCallback<messagebus::protocol::DocumentrouteselectorpolicyConfig> { private: - typedef std::shared_ptr<document::select::Node> SelectorPtr; - typedef std::map<string, SelectorPtr> ConfigMap; + using SelectorPtr = std::shared_ptr<document::select::Node>; + using ConfigMap = std::map<string, SelectorPtr>; const document::DocumentTypeRepo &_repo; mutable std::mutex _lock; diff --git a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h index ffeda17d778..cf9ba17f54b 100644 --- a/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h +++ b/documentapi/src/vespa/documentapi/messagebus/policies/messagetypepolicy.h @@ -29,8 +29,8 @@ class MessageTypePolicy : public mbus::IRoutingPolicy, public config::IFetcherCallback<vespa::config::content::MessagetyperouteselectorpolicyConfig> { private: - typedef vespalib::PtrHolder<policy::MessageTypeMap> MessageTypeHolder; - typedef vespalib::PtrHolder<mbus::Route> RouteHolder; + using MessageTypeHolder = vespalib::PtrHolder<policy::MessageTypeMap>; + using RouteHolder = vespalib::PtrHolder<mbus::Route>; MessageTypeHolder _map; RouteHolder _defaultRoute; diff --git a/documentapi/src/vespa/documentapi/messagebus/routablerepository.h b/documentapi/src/vespa/documentapi/messagebus/routablerepository.h index 255f6abd180..d7aac105475 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablerepository.h +++ b/documentapi/src/vespa/documentapi/messagebus/routablerepository.h @@ -31,9 +31,9 @@ private: IRoutableFactory::SP getFactory(const vespalib::Version &version) const; }; - typedef std::pair<vespalib::Version, uint32_t> CacheKey; - typedef std::map<CacheKey, IRoutableFactory::SP> FactoryCache; - typedef std::map<uint32_t, VersionMap> TypeMap; + using CacheKey = std::pair<vespalib::Version, uint32_t>; + using FactoryCache = std::map<CacheKey, IRoutableFactory::SP>; + using TypeMap = std::map<uint32_t, VersionMap>; mutable std::mutex _lock; TypeMap _factoryTypes; diff --git a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h index a57de3bfc40..7df40052178 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h +++ b/documentapi/src/vespa/documentapi/messagebus/routingpolicyrepository.h @@ -9,7 +9,7 @@ namespace documentapi { class RoutingPolicyRepository { private: - typedef std::map<string, IRoutingPolicyFactory::SP> FactoryMap; + using FactoryMap = std::map<string, IRoutingPolicyFactory::SP>; mutable std::mutex _lock; FactoryMap _factories; |