diff options
author | Haavard <havardpe@yahoo-inc.com> | 2017-03-20 13:04:33 +0000 |
---|---|---|
committer | Haavard <havardpe@yahoo-inc.com> | 2017-03-27 09:53:26 +0000 |
commit | 23abed1a0bc4f4c5ea47b43fc7ea0645e63a26e6 (patch) | |
tree | 6d943bbe31738f7e9b84979e4fd63dfd76eef580 /messagebus | |
parent | 8844ccb7297e8a5120dd903c85e923f2f93aa693 (diff) |
remove most usage of LinkedPtr from vespa
Diffstat (limited to 'messagebus')
3 files changed, 6 insertions, 6 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcservice.h b/messagebus/src/vespa/messagebus/network/rpcservice.h index 2566ad0f262..5b5afb1c704 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservice.h +++ b/messagebus/src/vespa/messagebus/network/rpcservice.h @@ -2,7 +2,6 @@ #pragma once #include <vespa/slobrok/imirrorapi.h> -#include <vespa/vespalib/util/linkedptr.h> #include "rpcserviceaddress.h" namespace mbus { @@ -26,7 +25,7 @@ private: AddressList _addressList; public: - typedef vespalib::LinkedPtr<RPCService> LP; + using UP = std::unique_ptr<RPCService>; RPCService(const RPCService &) = delete; RPCService & operator = (const RPCService &) = delete; /** diff --git a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp index 3b0e0072d38..83f0716948d 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcservicepool.cpp @@ -24,9 +24,10 @@ RPCServicePool::resolve(const string &pattern) if (_lru.hasKey(pattern)) { return _lru[pattern]->resolve(); } else { - RPCService::LP service(new RPCService(_net.getMirror(), pattern)); - _lru[pattern] = service; - return service->resolve(); + RPCService::UP service(new RPCService(_net.getMirror(), pattern)); + auto result = service->resolve(); + _lru[pattern] = std::move(service); + return result; } } diff --git a/messagebus/src/vespa/messagebus/network/rpcservicepool.h b/messagebus/src/vespa/messagebus/network/rpcservicepool.h index 55fac7da577..891a84fa4ef 100644 --- a/messagebus/src/vespa/messagebus/network/rpcservicepool.h +++ b/messagebus/src/vespa/messagebus/network/rpcservicepool.h @@ -14,7 +14,7 @@ class RPCNetwork; */ class RPCServicePool { private: - typedef vespalib::lrucache_map< vespalib::LruParam<string, RPCService::LP> > ServiceCache; + typedef vespalib::lrucache_map< vespalib::LruParam<string, RPCService::UP> > ServiceCache; RPCNetwork &_net; ServiceCache _lru; |