diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-21 18:37:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-21 18:37:21 +0100 |
commit | 541a88143878c25d771a6878376ef66416d54102 (patch) | |
tree | 6a2d66962f39b0bb362e5dfdfc1536d1fcf7b9fb /messagebus | |
parent | 766ee34d38c47deb1a234590eba6413d075d822a (diff) | |
parent | 13c416cd71b9927b60cc5ea4c9bcecafe472e8c9 (diff) |
Merge pull request #25325 from vespa-engine/geirst/typedef-to-using-in-cpp-code
Change from typedef to using in C++ code.
Diffstat (limited to 'messagebus')
37 files changed, 54 insertions, 54 deletions
diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp index ab94d6ee183..1abf5ae8ab2 100644 --- a/messagebus/src/tests/messagebus/messagebus.cpp +++ b/messagebus/src/tests/messagebus/messagebus.cpp @@ -51,7 +51,7 @@ struct Base { }; struct Client : public Base { - typedef std::unique_ptr<Client> UP; + using UP = std::unique_ptr<Client>; TestServer server; SourceSession::UP session; Client(Slobrok &slobrok) @@ -74,7 +74,7 @@ struct Server : public Base { }; struct DocProc : public Server { - typedef std::unique_ptr<DocProc> UP; + using UP = std::unique_ptr<DocProc>; IntermediateSession::UP session; DocProc(const string &name, Slobrok &slobrok) : Server(name, slobrok), session() @@ -84,7 +84,7 @@ struct DocProc : public Server { }; struct Search : public Server { - typedef std::unique_ptr<Search> UP; + using UP = std::unique_ptr<Search>; DestinationSession::UP session; Search(const string &name, Slobrok &slobrok) : Server(name, slobrok), session() diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp index 80bfc45184f..a5973bb2881 100644 --- a/messagebus/src/tests/sendadapter/sendadapter.cpp +++ b/messagebus/src/tests/sendadapter/sendadapter.cpp @@ -24,7 +24,7 @@ private: mutable vespalib::Version _lastVersion; public: - typedef std::shared_ptr<TestProtocol> SP; + using SP = std::shared_ptr<TestProtocol>; ~TestProtocol() override; mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const override { _lastVersion = version; diff --git a/messagebus/src/vespa/messagebus/callstack.h b/messagebus/src/vespa/messagebus/callstack.h index 35ebc27e2af..937a9e939b6 100644 --- a/messagebus/src/vespa/messagebus/callstack.h +++ b/messagebus/src/vespa/messagebus/callstack.h @@ -30,7 +30,7 @@ private: Context ctx; }; - typedef std::vector<Frame> Stack; + using Stack = std::vector<Frame>; Stack _stack; diff --git a/messagebus/src/vespa/messagebus/configagent.cpp b/messagebus/src/vespa/messagebus/configagent.cpp index dc89e87f62a..0184f0456cf 100644 --- a/messagebus/src/vespa/messagebus/configagent.cpp +++ b/messagebus/src/vespa/messagebus/configagent.cpp @@ -18,7 +18,7 @@ ConfigAgent::configure(std::unique_ptr<MessagebusConfig> config) { const MessagebusConfig &cfg(*config); RoutingSpec spec; - typedef MessagebusConfig CFG; + using CFG = MessagebusConfig; for (uint32_t t = 0; t < cfg.routingtable.size(); ++t) { const CFG::Routingtable &table = cfg.routingtable[t]; RoutingTableSpec tableSpec(table.protocol); diff --git a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h index 1ae7e88f876..d9fffebe595 100644 --- a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h @@ -37,8 +37,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<DynamicThrottlePolicy> UP; - typedef std::shared_ptr<DynamicThrottlePolicy> SP; + using UP = std::unique_ptr<DynamicThrottlePolicy>; + using SP = std::shared_ptr<DynamicThrottlePolicy>; /** * Constructs a new instance of this policy and sets the appropriate default values of member data. diff --git a/messagebus/src/vespa/messagebus/intermediatesession.h b/messagebus/src/vespa/messagebus/intermediatesession.h index 387a77e2274..0a17aa1e42a 100644 --- a/messagebus/src/vespa/messagebus/intermediatesession.h +++ b/messagebus/src/vespa/messagebus/intermediatesession.h @@ -40,7 +40,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IntermediateSession> UP; + using UP = std::unique_ptr<IntermediateSession>; /** * The destructor untangles from messagebus. After this method returns, messagebus will not invoke any diff --git a/messagebus/src/vespa/messagebus/iprotocol.h b/messagebus/src/vespa/messagebus/iprotocol.h index e46a5600471..a908a9c133c 100644 --- a/messagebus/src/vespa/messagebus/iprotocol.h +++ b/messagebus/src/vespa/messagebus/iprotocol.h @@ -27,12 +27,12 @@ public: /** * Convenience typedef for an auto pointer to an IProtocol object. */ - typedef std::unique_ptr<IProtocol> UP; + using UP = std::unique_ptr<IProtocol>; /** * Convenience typedef for a shared pointer to a IProtocol object. */ - typedef std::shared_ptr<IProtocol> SP; + using SP = std::shared_ptr<IProtocol>; /** * Obtain the name of this protocol. diff --git a/messagebus/src/vespa/messagebus/ithrottlepolicy.h b/messagebus/src/vespa/messagebus/ithrottlepolicy.h index 6ae0a0426ec..f654df800c0 100644 --- a/messagebus/src/vespa/messagebus/ithrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/ithrottlepolicy.h @@ -17,8 +17,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IThrottlePolicy> UP; - typedef std::shared_ptr<IThrottlePolicy> SP; + using UP = std::unique_ptr<IThrottlePolicy>; + using SP = std::shared_ptr<IThrottlePolicy>; /** * Virtual destructor required for inheritance. diff --git a/messagebus/src/vespa/messagebus/itimer.h b/messagebus/src/vespa/messagebus/itimer.h index b5b32fb22f4..8841751b72d 100644 --- a/messagebus/src/vespa/messagebus/itimer.h +++ b/messagebus/src/vespa/messagebus/itimer.h @@ -15,7 +15,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<ITimer> UP; + using UP = std::unique_ptr<ITimer>; /** * Virtual destructor required for inheritance. diff --git a/messagebus/src/vespa/messagebus/messagebus.cpp b/messagebus/src/vespa/messagebus/messagebus.cpp index 49ea955754c..8012eabf9b1 100644 --- a/messagebus/src/vespa/messagebus/messagebus.cpp +++ b/messagebus/src/vespa/messagebus/messagebus.cpp @@ -256,7 +256,7 @@ MessageBus::unregisterSession(const string &sessionName) RoutingTable::SP MessageBus::getRoutingTable(const string &protocol) { - typedef std::map<string, RoutingTable::SP>::iterator ITR; + using ITR = std::map<string, RoutingTable::SP>::iterator; std::lock_guard guard(_lock); ITR itr = _routingTables.find(protocol); if (itr == _routingTables.end()) { diff --git a/messagebus/src/vespa/messagebus/messenger.h b/messagebus/src/vespa/messagebus/messenger.h index 0d36e6006cb..6ec42ed9c4c 100644 --- a/messagebus/src/vespa/messagebus/messenger.h +++ b/messagebus/src/vespa/messagebus/messenger.h @@ -30,7 +30,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<ITask> UP; + using UP = std::unique_ptr<ITask>; /** * Returns the priority of this task. diff --git a/messagebus/src/vespa/messagebus/network/iserviceaddress.h b/messagebus/src/vespa/messagebus/network/iserviceaddress.h index 0ffce7fd2d6..fe55cdd98c7 100644 --- a/messagebus/src/vespa/messagebus/network/iserviceaddress.h +++ b/messagebus/src/vespa/messagebus/network/iserviceaddress.h @@ -17,7 +17,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IServiceAddress> UP; + using UP = std::unique_ptr<IServiceAddress>; /** * Virtual destructor required for inheritance. diff --git a/messagebus/src/vespa/messagebus/network/rpcsend_private.h b/messagebus/src/vespa/messagebus/network/rpcsend_private.h index 5d501cf9115..bc68f39507a 100644 --- a/messagebus/src/vespa/messagebus/network/rpcsend_private.h +++ b/messagebus/src/vespa/messagebus/network/rpcsend_private.h @@ -38,7 +38,7 @@ private: vespalib::Version _version; public: - typedef std::unique_ptr<ReplyContext> UP; + using UP = std::unique_ptr<ReplyContext>; ReplyContext(const ReplyContext &) = delete; ReplyContext & operator = (const ReplyContext &) = delete; diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.h b/messagebus/src/vespa/messagebus/network/rpcservice.h index 83b7083a788..ab18503c85b 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservice.h +++ b/messagebus/src/vespa/messagebus/network/rpcservice.h @@ -15,7 +15,7 @@ class RPCNetwork; */ class RPCService { private: - typedef slobrok::api::IMirrorAPI Mirror; + using Mirror = slobrok::api::IMirrorAPI ; string _serviceName; string _connectionSpec; diff --git a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h index d5b7396fc50..2ca57474a80 100644 --- a/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h +++ b/messagebus/src/vespa/messagebus/network/rpcserviceaddress.h @@ -23,7 +23,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<RPCServiceAddress> UP; + using UP = std::unique_ptr<RPCServiceAddress>; /** * Constructs a service address from the given specifications. The last component of the service is stored diff --git a/messagebus/src/vespa/messagebus/network/rpctarget.h b/messagebus/src/vespa/messagebus/network/rpctarget.h index b6f1bf116c5..fffffae64f7 100644 --- a/messagebus/src/vespa/messagebus/network/rpctarget.h +++ b/messagebus/src/vespa/messagebus/network/rpctarget.h @@ -39,7 +39,7 @@ public: }; private: - typedef std::vector<IVersionHandler*> HandlerList; + using HandlerList = std::vector<IVersionHandler*>; enum ResolveState { VERSION_NOT_RESOLVED, @@ -47,7 +47,7 @@ private: PROCESSING_HANDLERS, VERSION_RESOLVED, }; - typedef std::unique_ptr<vespalib::Version> Version_UP; + using Version_UP = std::unique_ptr<vespalib::Version>; std::mutex _lock; std::condition_variable _cond; @@ -62,7 +62,7 @@ public: /** * Convenience typedefs. */ - typedef std::shared_ptr<RPCTarget> SP; + using SP = std::shared_ptr<RPCTarget>; /** * Constructs a new instance of this class. This object creates and diff --git a/messagebus/src/vespa/messagebus/reply.h b/messagebus/src/vespa/messagebus/reply.h index 57cc02407b9..550f8e68e44 100644 --- a/messagebus/src/vespa/messagebus/reply.h +++ b/messagebus/src/vespa/messagebus/reply.h @@ -26,7 +26,7 @@ public: /** * Convenience typedef for an auto pointer to a Reply object. */ - typedef std::unique_ptr<Reply> UP; + using UP = std::unique_ptr<Reply>; /** * Constructs a new instance of this class. This object is useless until the diff --git a/messagebus/src/vespa/messagebus/routable.h b/messagebus/src/vespa/messagebus/routable.h index ca0bc6a438b..eaf14a93e87 100644 --- a/messagebus/src/vespa/messagebus/routable.h +++ b/messagebus/src/vespa/messagebus/routable.h @@ -32,7 +32,7 @@ public: /** * Convenience typedef for an auto pointer to a Routable object. */ - typedef std::unique_ptr<Routable> UP; + using UP = std::unique_ptr<Routable>; Routable(const Routable &) = delete; Routable & operator = (const Routable &) = delete; diff --git a/messagebus/src/vespa/messagebus/routing/hop.h b/messagebus/src/vespa/messagebus/routing/hop.h index af169e2dbc5..4a64c16057a 100644 --- a/messagebus/src/vespa/messagebus/routing/hop.h +++ b/messagebus/src/vespa/messagebus/routing/hop.h @@ -20,7 +20,7 @@ public: /** * Convenience typedef for an auto-pointer to a hop. */ - typedef std::unique_ptr<Hop> UP; + using UP = std::unique_ptr<Hop>; /** * Constructs an empty hop. diff --git a/messagebus/src/vespa/messagebus/routing/ihopdirective.h b/messagebus/src/vespa/messagebus/routing/ihopdirective.h index 7b0d0597fc7..d9991415d10 100644 --- a/messagebus/src/vespa/messagebus/routing/ihopdirective.h +++ b/messagebus/src/vespa/messagebus/routing/ihopdirective.h @@ -28,8 +28,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IHopDirective> UP; - typedef std::shared_ptr<IHopDirective> SP; + using UP = std::unique_ptr<IHopDirective>; + using SP = std::shared_ptr<IHopDirective>; /** * Implements a virtual destructor to allow virtual methods. diff --git a/messagebus/src/vespa/messagebus/routing/iroutingpolicy.h b/messagebus/src/vespa/messagebus/routing/iroutingpolicy.h index 13fee63cd33..adb9c8890e0 100644 --- a/messagebus/src/vespa/messagebus/routing/iroutingpolicy.h +++ b/messagebus/src/vespa/messagebus/routing/iroutingpolicy.h @@ -19,8 +19,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<IRoutingPolicy> UP; - typedef std::shared_ptr<IRoutingPolicy> SP; + using UP = std::unique_ptr<IRoutingPolicy>; + using SP = std::shared_ptr<IRoutingPolicy>; IRoutingPolicy(const IRoutingPolicy &) = delete; IRoutingPolicy & operator = (const IRoutingPolicy &) = delete; diff --git a/messagebus/src/vespa/messagebus/routing/resender.h b/messagebus/src/vespa/messagebus/routing/resender.h index fbce5c7fe8e..b395639ec2d 100644 --- a/messagebus/src/vespa/messagebus/routing/resender.h +++ b/messagebus/src/vespa/messagebus/routing/resender.h @@ -23,7 +23,7 @@ class Resender { private: using time_point = std::chrono::steady_clock::time_point; - typedef std::pair<time_point , RoutingNode*> Entry; + using Entry = std::pair<time_point , RoutingNode*>; struct Cmp { bool operator()(const Entry &a, const Entry &b) { return (b.first < a.first); @@ -38,7 +38,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<Resender> UP; + using UP = std::unique_ptr<Resender>; Resender(const Resender &) = delete; Resender & operator = (const Resender &) = delete; diff --git a/messagebus/src/vespa/messagebus/routing/route.h b/messagebus/src/vespa/messagebus/routing/route.h index d5ef259212a..d5839c128d1 100644 --- a/messagebus/src/vespa/messagebus/routing/route.h +++ b/messagebus/src/vespa/messagebus/routing/route.h @@ -23,7 +23,7 @@ public: /** * Convenience typedef for an auto-pointer to a route. */ - typedef std::unique_ptr<Route> UP; + using UP = std::unique_ptr<Route>; /** * Parses the given string as a list of space-separated hops. The {@link this#toString()} method is compatible with diff --git a/messagebus/src/vespa/messagebus/routing/routingcontext.h b/messagebus/src/vespa/messagebus/routing/routingcontext.h index 2700badb1d4..d1323c35f22 100644 --- a/messagebus/src/vespa/messagebus/routing/routingcontext.h +++ b/messagebus/src/vespa/messagebus/routing/routingcontext.h @@ -31,7 +31,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<RoutingContext> UP; + using UP = std::unique_ptr<RoutingContext>; /** * Constructs a new routing context for a given routing node and hop. diff --git a/messagebus/src/vespa/messagebus/routing/routingnode.h b/messagebus/src/vespa/messagebus/routing/routingnode.h index f64afa07f01..d6d4da64ae4 100644 --- a/messagebus/src/vespa/messagebus/routing/routingnode.h +++ b/messagebus/src/vespa/messagebus/routing/routingnode.h @@ -211,7 +211,7 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<RoutingNode> UP; + using UP = std::unique_ptr<RoutingNode>; /** * Constructs a new instance of this class. This is the root node diff --git a/messagebus/src/vespa/messagebus/routing/routingtable.h b/messagebus/src/vespa/messagebus/routing/routingtable.h index 99d8ade2efe..1cb113fa17c 100644 --- a/messagebus/src/vespa/messagebus/routing/routingtable.h +++ b/messagebus/src/vespa/messagebus/routing/routingtable.h @@ -63,7 +63,7 @@ public: /** * Convenience typedef for a shared pointer to a RoutingTable object. */ - typedef std::shared_ptr<RoutingTable> SP; + using SP = std::shared_ptr<RoutingTable>; RoutingTable(const RoutingTable &) = delete; RoutingTable & operator = (const RoutingTable &) = delete; diff --git a/messagebus/src/vespa/messagebus/rpcmessagebus.h b/messagebus/src/vespa/messagebus/rpcmessagebus.h index ed4258bef2d..ae6fff065dd 100644 --- a/messagebus/src/vespa/messagebus/rpcmessagebus.h +++ b/messagebus/src/vespa/messagebus/rpcmessagebus.h @@ -28,8 +28,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<RPCMessageBus> UP; - typedef std::shared_ptr<RPCMessageBus> SP; + using UP = std::unique_ptr<RPCMessageBus>; + using SP = std::shared_ptr<RPCMessageBus>; RPCMessageBus(const RPCMessageBus &) = delete; RPCMessageBus & operator = (const RPCMessageBus &) = delete; diff --git a/messagebus/src/vespa/messagebus/sequencer.h b/messagebus/src/vespa/messagebus/sequencer.h index 676de2bd08c..be6f03497c4 100644 --- a/messagebus/src/vespa/messagebus/sequencer.h +++ b/messagebus/src/vespa/messagebus/sequencer.h @@ -24,8 +24,8 @@ private: std::mutex _lock; IMessageHandler &_sender; - typedef Queue<Message*> MessageQueue; - typedef std::map<uint64_t, MessageQueue*> QueueMap; + using MessageQueue = Queue<Message*>; + using QueueMap = std::map<uint64_t, MessageQueue*>; QueueMap _seqMap; private: @@ -51,7 +51,7 @@ public: /** * Convenience typedef for an auto pointer to a Sequencer object. */ - typedef std::unique_ptr<Sequencer> UP; + using UP = std::unique_ptr<Sequencer>; /** * Create a new Sequencer using the given sender to send messages. diff --git a/messagebus/src/vespa/messagebus/sourcesession.h b/messagebus/src/vespa/messagebus/sourcesession.h index 364533ece17..d918724ad4f 100644 --- a/messagebus/src/vespa/messagebus/sourcesession.h +++ b/messagebus/src/vespa/messagebus/sourcesession.h @@ -48,7 +48,7 @@ public: /** * Convenience typedef for an auto pointer to a SourceSession object. **/ - typedef std::unique_ptr<SourceSession> UP; + using UP = std::unique_ptr<SourceSession>; /** * The destructor untangles from messagebus. This is safe, but you will loose the replies of all pending diff --git a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h index cbc75151306..ad5eeada309 100644 --- a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h @@ -24,8 +24,8 @@ public: /** * Convenience typedefs. */ - typedef std::unique_ptr<StaticThrottlePolicy> UP; - typedef std::shared_ptr<StaticThrottlePolicy> SP; + using UP = std::unique_ptr<StaticThrottlePolicy>; + using SP = std::shared_ptr<StaticThrottlePolicy>; /** * Constructs a new instance of this policy and sets the appropriate default values of member data. diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp index b8518f60c76..94e051b0752 100644 --- a/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp +++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.cpp @@ -126,8 +126,8 @@ void CustomPolicyFactory::parseRoutes(const string &str, std::vector<Route> &routes) { - typedef boost::char_separator<char> Separator; - typedef boost::tokenizer<Separator> Tokenizer; + using Separator = boost::char_separator<char>; + using Tokenizer = boost::tokenizer<Separator>; Separator separator(","); std::string stdstr(str); Tokenizer tokenizer(stdstr, separator); diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h index 0486f058217..1f1a4b46f07 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h @@ -17,7 +17,7 @@ public: /** * Convenience typedefs. */ - typedef std::shared_ptr<IPolicyFactory> SP; + using SP = std::shared_ptr<IPolicyFactory>; /** * Required for inheritance. @@ -34,7 +34,7 @@ public: }; private: - typedef std::map<string, IPolicyFactory::SP> FactoryMap; + using FactoryMap = std::map<string, IPolicyFactory::SP>; FactoryMap _policies; public: diff --git a/messagebus/src/vespa/messagebus/testlib/simplereply.h b/messagebus/src/vespa/messagebus/testlib/simplereply.h index acfa48a77fe..1e6005b586b 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplereply.h +++ b/messagebus/src/vespa/messagebus/testlib/simplereply.h @@ -13,7 +13,7 @@ private: string _value; SimpleReply &operator=(const SimpleReply &); public: - typedef std::unique_ptr<SimpleReply> UP; + using UP = std::unique_ptr<SimpleReply>; SimpleReply(const string &str); virtual ~SimpleReply(); void setValue(const string &value); diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.h b/messagebus/src/vespa/messagebus/testlib/slobrok.h index 4b4b21ddcbd..7810222f07d 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.h +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.h @@ -33,7 +33,7 @@ private: void init(); public: - typedef std::unique_ptr<Slobrok> UP; + using UP = std::unique_ptr<Slobrok>; Slobrok(); Slobrok(int port); ~Slobrok(); diff --git a/messagebus/src/vespa/messagebus/testlib/slobrokstate.h b/messagebus/src/vespa/messagebus/testlib/slobrokstate.h index 7eea0450be2..b4fe368c391 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrokstate.h +++ b/messagebus/src/vespa/messagebus/testlib/slobrokstate.h @@ -10,8 +10,8 @@ namespace mbus { class SlobrokState { public: - typedef std::vector<std::pair<string, uint32_t> > TYPE; - typedef TYPE::const_iterator ITR; + using TYPE = std::vector<std::pair<string, uint32_t> >; + using ITR = TYPE::const_iterator; private: TYPE _data; diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.h b/messagebus/src/vespa/messagebus/testlib/testserver.h index 7d144689f9f..1ea96c3e13f 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.h +++ b/messagebus/src/vespa/messagebus/testlib/testserver.h @@ -28,7 +28,7 @@ public: class TestServer { public: - typedef std::unique_ptr<TestServer> UP; + using UP = std::unique_ptr<TestServer>; TestServer(const TestServer &) = delete; TestServer & operator = (const TestServer &) = delete; diff --git a/messagebus/src/vespa/messagebus/tracelevel.h b/messagebus/src/vespa/messagebus/tracelevel.h index 949fc1ddc9a..e2bf15e02b8 100644 --- a/messagebus/src/vespa/messagebus/tracelevel.h +++ b/messagebus/src/vespa/messagebus/tracelevel.h @@ -4,7 +4,7 @@ #include <vespa/vespalib/trace/tracelevel.h> namespace mbus { - typedef vespalib::TraceLevel TraceLevel; + using TraceLevel = vespalib::TraceLevel; } // namespace mbus |