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

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +3 -13
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fa7f6af01f - Show all commits

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

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

10
src/thread/thread.cpp
View file

@ -98,16 +98,6 @@ namespace fc {
my = new thread_d(*this); 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() { thread::~thread() {
//wlog( "my ${n}", ("n",name()) ); //wlog( "my ${n}", ("n",name()) );
if( my ) if( my )