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

15
src/exception.cpp
View file

@ -194,7 +194,7 @@ namespace fc
ss << " " << my->_name << ": " << my->_what << "\n"; ss << " " << my->_name << ": " << my->_what << "\n";
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) { for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) {
try { try {
ss << itr->get_message() <<"\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n"; ss << itr->get_message() <<"\n";
try try
{ {
ss << " " << json::to_string( itr->get_data() )<<"\n"; ss << " " << json::to_string( itr->get_data() )<<"\n";
@ -227,18 +227,11 @@ namespace fc
{ {
std::stringstream ss; std::stringstream ss;
try { try {
ss << my->_what; ss << what() << ":";
try {
ss << " (" << variant( my->_code ).as_string() << ")\n";
} catch( std::bad_alloc& ) {
throw;
} catch( ... ) {
ss << "<- exception in to_string.\n";
}
for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) { for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) {
if( itr->get_format().size() )
try { try {
ss << fc::format_string( itr->get_format(), itr->get_data() ) << "\n"; ss << " " << fc::format_string( itr->get_format(), itr->get_data() );
// ss << " " << itr->get_context().to_string() <<"\n";
} catch( std::bad_alloc& ) { } catch( std::bad_alloc& ) {
throw; throw;
} catch( ... ) { } catch( ... ) {