Ubuntu 18.04 Upgrade #3

Merged
RoshanSyed merged 143 commits from github/fork/PBSA/master into master 2019-09-03 16:20:50 +00:00
Showing only changes of commit b94a338e56 - Show all commits

View file

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