From d729816b06651ccde50940c92db729cf9fb4c61e Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Wed, 18 Sep 2019 12:51:17 +0200 Subject: [PATCH] Changes to avoid conflict in following cherry-pick --- src/exception.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/exception.cpp b/src/exception.cpp index d3fadbb..cc93009 100644 --- a/src/exception.cpp +++ b/src/exception.cpp @@ -182,11 +182,11 @@ namespace fc */ string exception::to_detail_string( log_level ll )const { - fc::stringstream ss; + std::stringstream ss; ss << variant(my->_code).as_string() <<" " << my->_name << ": " <_what<<"\n"; for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ) { - ss << itr->get_message() <<"\n"; + ss << itr->get_message() <<"\n"; //fc::format_string( itr->get_format(), itr->get_data() ) <<"\n"; try { ss << " " << json::to_string( itr->get_data() )<<"\n"; @@ -207,12 +207,12 @@ namespace fc */ string exception::to_string( log_level ll )const { - fc::stringstream ss; - ss << what() << ":"; + std::stringstream ss; + ss << what() << " (" << variant(my->_code).as_string() <<")\n"; for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr ) { - if( itr->get_format().size() ) - ss << " " << fc::format_string( itr->get_format(), itr->get_data() ); + ss << fc::format_string( itr->get_format(), itr->get_data() ) << "\n"; + // ss << " " << itr->get_context().to_string() <<"\n"; } return ss.str(); }