diff options
author | Henning Baldersheim <balder@oath.com> | 2018-09-28 12:29:02 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-09-28 12:29:02 +0200 |
commit | e13b1f967395bd2889c3d9b4116f0c0e3a8f2e00 (patch) | |
tree | 37a5f81680d0fe8c58f196550ff3bd2397d1115d /slobrok/src | |
parent | c6013b46e49bf4833f5ab6f41a361db5883edc09 (diff) |
Use std::unique_ptr
Diffstat (limited to 'slobrok/src')
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp | 9 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpc_server_manager.h | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp index ba7d94e3885..6c337d54f03 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.cpp @@ -283,11 +283,8 @@ RpcServerManager::~RpcServerManager() void RpcServerManager::PerformTask() { - std::vector<ManagedRpcServer *> dl; - std::swap(dl, _deleteList); - for (uint32_t i = 0; i < dl.size(); ++i) { - delete dl[i]; - } + std::vector<std::unique_ptr<ManagedRpcServer>> deleteAfterSwap; + std::swap(deleteAfterSwap, _deleteList); } @@ -319,7 +316,7 @@ RpcServerManager::notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::string errms LOG(warning, "unmanaged server %s at %s failed: %s", rpcsrv->getName().c_str(), rpcsrv->getSpec().c_str(), errmsg.c_str()); } - _deleteList.push_back(rpcsrv); + _deleteList.push_back(std::unique_ptr<ManagedRpcServer>(rpcsrv)); ScheduleNow(); } diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h index 9d3ba3c573e..ccee7691f55 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h @@ -7,6 +7,7 @@ #include "named_service.h" #include <vespa/fnet/task.h> #include <vector> +#include <memory> namespace slobrok { @@ -55,7 +56,7 @@ private: } }; std::vector<MRSandRRSC> _addManageds; - std::vector<ManagedRpcServer *> _deleteList; + std::vector<std::unique_ptr<ManagedRpcServer>> _deleteList; public: OkState checkPartner(const std::string & remslobrok); |