hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2002 Replace auto_ptr with unique_ptr

Browse Source 
Given 'Derived : public Base', a unique_ptr<Derived> converts
implictly to a unique_ptr<Base>.
This commit is contained in:
Johan Wikman
2018-08-09 11:12:32 +03:00
parent 9cfd451a1d
commit 6335d3776c
7 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/routingworker.cc
View File

@ -614,7 +614,7 @@ size_t RoutingWorker::broadcast(Task* pTask, Semaphore* pSem)
}
//static
size_t RoutingWorker::broadcast(std::auto_ptr<DisposableTask> sTask)
size_t RoutingWorker::broadcast(std::unique_ptr<DisposableTask> sTask)
{
DisposableTask* pTask = sTask.release();
Worker::inc_ref(pTask);
@ -1165,12 +1165,12 @@ protected:
size_t mxs_rworker_broadcast(void (*cb)(void* data), void* data)
{
std::auto_ptr<FunctionTask> task(new FunctionTask([cb, data]()
std::unique_ptr<FunctionTask> task(new FunctionTask([cb, data]()
{
cb(data);
}));
return RoutingWorker::broadcast(task);
return RoutingWorker::broadcast(std::move(task));
}
uint64_t mxs_rworker_create_key()
@ -1195,8 +1195,8 @@ void mxs_rworker_delete_data(uint64_t key)
RoutingWorker::get_current()->delete_data(key);
};
std::auto_ptr<FunctionTask> task(new FunctionTask(func));
RoutingWorker::broadcast(task);
std::unique_ptr<FunctionTask> task(new FunctionTask(func));
RoutingWorker::broadcast(std::move(task));
}
json_t* mxs_rworker_to_json(const char* zHost, int id)