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

Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
Conversation 0 Commits 144 Files changed 636 +4 -3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b94a338e56 - Show all commits

7
src/log/console_appender.cpp
View file

@ -14,6 +14,7 @@
#include <fc/exception/exception.hpp>
#include <iomanip>
#include <sstream>
#include <mutex>
namespace fc {
@ -27,7 +28,7 @@ namespace fc {
#endif
};
console_appender::console_appender( const variant& args )
console_appender::console_appender( const variant& args )
:my(new impl)
{
configure( args.as<config>() );
@ -66,7 +67,7 @@ namespace fc {
#ifdef WIN32
static WORD
#else
static const char*
static const char*
#endif
get_console_color(console_appender::color::type t ) {
switch( t ) {
@ -140,7 +141,7 @@ namespace fc {
#endif
if( text.size() )
fprintf( out, "%s", text.c_str() ); //fmt_str.c_str() );
fprintf( out, "%s", text.c_str() ); //fmt_str.c_str() );
#ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)