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

Make future's cancel_and_wait automatically swallow the canceled_exception since it is expected.

Browse source
This commit is contained in:
Eric Frias 2014-07-26 14:51:48 -04:00
parent c208a968b2
commit 24ba357b0d
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/fc/thread/future.hpp
View file

@ -211,8 +211,14 @@ namespace fc {
if( valid() ) if( valid() )
{ {
cancel(); cancel();
try
{
wait(); wait();
} }
catch (const canceled_exception&)
{
}
}
} }
/** /**
@ -266,8 +272,14 @@ namespace fc {
void cancel_and_wait() void cancel_and_wait()
{ {
cancel(); cancel();
try
{
wait(); wait();
} }
catch (const canceled_exception&)
{
}
}
/// @pre valid() /// @pre valid()
bool ready()const { return m_prom->ready(); } bool ready()const { return m_prom->ready(); }