Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge pull request #299 from abitmore/fix-win-build

Browse source 
Fix Windows build.
This commit is contained in:
Vikram Rajkumar 2017-06-04 18:17:42 -05:00 committed by GitHub
commit a4d2fd6427
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -32,13 +32,16 @@ if (USE_PCH)
include (cotire) include (cotire)
endif(USE_PCH) 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" ) list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/GitVersionGen" )
include( GetGitRevisionDescription ) include( GetGitRevisionDescription )
get_git_head_revision( GIT_REFSPEC GIT_SHA2 ) get_git_head_revision( GIT_REFSPEC GIT_SHA2 )
SET(BOOST_COMPONENTS) SET(BOOST_COMPONENTS)
LIST(APPEND BOOST_COMPONENTS thread LIST(APPEND BOOST_COMPONENTS thread
iostreams
date_time date_time
system system
filesystem filesystem

4
libraries/chain/db_notify.cpp
View file

@ -387,6 +387,6 @@ void database::notify_changed_objects()
removed_objects(removed_ids, removed, removed_accounts_impacted); removed_objects(removed_ids, removed, removed_accounts_impacted);
} }
} }
} FC_CAPTURE_AND_LOG( () ) } } FC_CAPTURE_AND_LOG( (0) ) }
} } } }

8
libraries/net/node.cpp
View file

@ -974,11 +974,7 @@ namespace graphene { namespace net { namespace detail {
{ {
throw; throw;
} }
catch (const fc::exception& e) FC_CAPTURE_AND_LOG( (0) )
{
elog("${e}", ("e", e));
}
FC_CAPTURE_AND_LOG( () )
}// while(!canceled) }// while(!canceled)
} }
@ -4193,7 +4189,7 @@ namespace graphene { namespace net { namespace detail {
// limit the rate at which we accept connections to mitigate DOS attacks // limit the rate at which we accept connections to mitigate DOS attacks
fc::usleep( fc::milliseconds(10) ); fc::usleep( fc::milliseconds(10) );
} FC_CAPTURE_AND_LOG( () ) } FC_CAPTURE_AND_LOG( (0) )
} }
} // accept_loop() } // accept_loop()