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

2
src/io/json.cpp
View file

@ -631,7 +631,7 @@ namespace fc
to_stream(os, v.get_object(), format, max_depth - 1 );
return;
default:
FC_THROW_EXCEPTION( fc::invalid_arg_exception, "Unsupported variant type: " + v.get_type() );
FC_THROW_EXCEPTION( fc::invalid_arg_exception, "Unsupported variant type: ${type}", ( "type", v.get_type() ) );
}
}

2
tests/thread/parallel_tests.cpp
View file

@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE( do_something_parallel )
results.reserve( 20 );
boost::thread_specific_ptr<int> tls;
for( size_t i = 0; i < results.capacity(); i++ )
results.push_back( fc::do_parallel( [i,&tls] () {
results.push_back( fc::do_parallel( [&tls] () {
if( !tls.get() ) { tls.reset( new int(0) ); }
result res = { boost::this_thread::get_id(), (*tls.get())++ };
return res;