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 +5 -2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 201b4b33f0 - Show all commits

7
src/thread/thread_d.hpp
View file

@ -1,12 +1,14 @@
#include <fc/thread/thread.hpp> #include <fc/thread/thread.hpp>
#include <fc/stacktrace.hpp>
#include <fc/time.hpp> #include <fc/time.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "context.hpp" #include "context.hpp"
#include <boost/thread/condition_variable.hpp> #include <boost/thread/condition_variable.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <boost/atomic.hpp> #include <boost/atomic.hpp>
#include <iostream>
#include <vector> #include <vector>
//#include <fc/logger.hpp>
namespace fc { namespace fc {
struct sleep_priority_less { struct sleep_priority_less {
@ -390,7 +392,8 @@ namespace fc {
/* NB: At least on Win64, this only catches a yield while in the body of /* NB: At least on Win64, this only catches a yield while in the body of
* a catch block; it fails to catch a yield while unwinding the stack, which * a catch block; it fails to catch a yield while unwinding the stack, which
* is probably just as likely to cause crashes */ * is probably just as likely to cause crashes */
assert(std::current_exception() == std::exception_ptr()); if( std::current_exception() != std::exception_ptr() )
print_stacktrace( std::cerr );
check_for_timeouts(); check_for_timeouts();
if( !current ) if( !current )