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

Merge pull request #102 from bitshares/jmj_macwarn

Browse source 
Fix some macOS warnings
This commit is contained in:
John M. Jones 2019-01-17 12:28:56 -05:00 committed by GitHub
commit 2bf93ec086
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/io/json.cpp
View file

@ -631,7 +631,7 @@ namespace fc
to_stream(os, v.get_object(), format, max_depth - 1 ); to_stream(os, v.get_object(), format, max_depth - 1 );
return; return;
default: 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 ); results.reserve( 20 );
boost::thread_specific_ptr<int> tls; boost::thread_specific_ptr<int> tls;
for( size_t i = 0; i < results.capacity(); i++ ) 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) ); } if( !tls.get() ) { tls.reset( new int(0) ); }
result res = { boost::this_thread::get_id(), (*tls.get())++ }; result res = { boost::this_thread::get_id(), (*tls.get())++ };
return res; return res;