epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Thread accept non-copyable std::function

Browse Source
This commit is contained in:
Michael Davidsaver
2018-07-11 16:29:27 -07:00
parent a029455466
commit 340fa8a7cb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc/pv/thread.h
View File

@@ -111,7 +111,7 @@ public:
template<typename C>
Config(C* inst, void(C::*meth)()) {this->x_setdefault();this->run(inst, meth);}
#if __cplusplus>=201103L
Config(const std::function<void()>& fn);
Config(std::function<void()>&& fn);
#endif
Config& name(const std::string& n);
@@ -132,7 +132,7 @@ public:
return *this;
}
#if __cplusplus>=201103L
Config& run(const std::function<void()>& fn);
Config& run(std::function<void()>&& fn);
#endif
//! Append to thread name string. Argument must be understood by std::ostream::operator<<

8
src/misc/thread.cpp
View File

@@ -29,7 +29,7 @@ struct BindRunner : public epicsThreadRunable
{
typedef std::function<void()> fn_t;
fn_t fn;
BindRunner(const fn_t f) : fn(f) {}
BindRunner(fn_t&& f) : fn(std::move(f)) {}
virtual ~BindRunner() {}
virtual void run()
{
@@ -64,7 +64,7 @@ Thread::Config::Config(Runnable *r) {this->x_setdefault();this->run(r);}
Thread::Config::Config(void(*fn)(void*), void *ptr) {this->x_setdefault();this->run(fn, ptr);}
#if __cplusplus>=201103L
Thread::Config::Config(const std::function<void()>& fn) {this->x_setdefault();this->run(fn);}
Thread::Config::Config(std::function<void()>&& fn) {this->x_setdefault();this->run(std::move(fn));}
#endif
Thread::Config& Thread::Config::name(const std::string& n)
@@ -90,9 +90,9 @@ Thread::Config& Thread::Config::run(void(*fn)(void*), void *ptr)
}
#if __cplusplus>=201103L
Thread::Config& Thread::Config::run(const std::function<void()>& fn)
Thread::Config& Thread::Config::run(std::function<void()> &&fn)
{
this->p_owned_runner.reset(new detail::BindRunner(fn));
this->p_owned_runner.reset(new detail::BindRunner(std::move(fn)));
this->p_runner = this->p_owned_runner.get();
return *this;
}