Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Delete broken (wrt fc::current_thread()) move stuff

Browse source
This commit is contained in:
Peter Conrad 2018-10-03 10:31:57 +02:00
parent 7e8debbad4
commit fa7f6af01f
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/fc/thread/thread.hpp
View file

@ -22,8 +22,8 @@ namespace fc {
class thread {
public:
thread( const std::string& name = "" );
thread( thread&& m );
thread& operator=(thread&& t );
thread( thread&& m ) = delete;
thread& operator=(thread&& t ) = delete;
/**
* Returns the current thread.
@ -130,7 +130,7 @@ namespace fc {
return wait_any_until(fc::move(proms), fc::time_point::now()+timeout_us );
}
private:
thread( class thread_d* );
thread( class thread_d* ); // parameter is ignored, will create a new thread_d
friend class promise_base;
friend class task_base;
friend class thread_d;

10
src/thread/thread.cpp
View file

@ -98,16 +98,6 @@ namespace fc {
my = new thread_d(*this);
}
thread::thread( thread&& m ) {
my = m.my;
m.my = 0;
}
thread& thread::operator=(thread&& t ) {
fc_swap(t.my,my);
return *this;
}
thread::~thread() {
//wlog( "my ${n}", ("n",name()) );
if( my )