From 06b18c4011426a79a5d9922d3b4490b2e0885475 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 3 Jun 2017 00:07:14 +0000 Subject: [PATCH] Fix Windows build. --- CMakeLists.txt | 5 ++++- libraries/chain/db_notify.cpp | 4 ++-- libraries/net/node.cpp | 8 ++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a5d3667..49abfd29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,13 +32,16 @@ if (USE_PCH) include (cotire) endif(USE_PCH) -list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" ) +IF( NOT WIN32 ) + list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" ) +ENDIF( NOT WIN32 ) list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/GitVersionGen" ) include( GetGitRevisionDescription ) get_git_head_revision( GIT_REFSPEC GIT_SHA2 ) SET(BOOST_COMPONENTS) LIST(APPEND BOOST_COMPONENTS thread + iostreams date_time system filesystem diff --git a/libraries/chain/db_notify.cpp b/libraries/chain/db_notify.cpp index 7b5375cc..0dfb21c2 100644 --- a/libraries/chain/db_notify.cpp +++ b/libraries/chain/db_notify.cpp @@ -387,6 +387,6 @@ void database::notify_changed_objects() removed_objects(removed_ids, removed, removed_accounts_impacted); } } -} FC_CAPTURE_AND_LOG( () ) } +} FC_CAPTURE_AND_LOG( (0) ) } -} } \ No newline at end of file +} } diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index f9309123..5325c9b1 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -974,11 +974,7 @@ namespace graphene { namespace net { namespace detail { { throw; } - catch (const fc::exception& e) - { - elog("${e}", ("e", e)); - } - FC_CAPTURE_AND_LOG( () ) + FC_CAPTURE_AND_LOG( (0) ) }// while(!canceled) } @@ -4193,7 +4189,7 @@ namespace graphene { namespace net { namespace detail { // limit the rate at which we accept connections to mitigate DOS attacks fc::usleep( fc::milliseconds(10) ); - } FC_CAPTURE_AND_LOG( () ) + } FC_CAPTURE_AND_LOG( (0) ) } } // accept_loop()