diff --git a/.gitignore b/.gitignore index a5e91ea54..0d69d66d2 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ node_modules/ # vscode .vscode/ +/.vs diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2a07a7f..ad8f261df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ cable_configure_toolchain(DEFAULT cxx11) set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of Hunter packages") set(HUNTER_JOBS_NUMBER 6 CACHE STRING "Number of parallel builds used by Hunter") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.23.112.tar.gz" - SHA1 "4b894e1d5d203f0cc9a77431dbb1b486ab6f4430" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.320.tar.gz" + SHA1 "9b4e732afd22f40482c11ad6342f7d336634226f" LOCAL ) diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 000000000..ee1d09858 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,15 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Release", + "inheritEnvironments": [ "msvc_x64_x64" ], + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "" + } + ] +} \ No newline at end of file diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 2b45ddb72..2c44f35a6 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -1,2 +1,2 @@ hunter_config(CURL VERSION ${HUNTER_CURL_VERSION} CMAKE_ARGS HTTP_ONLY=ON CMAKE_USE_OPENSSL=OFF CMAKE_USE_LIBSSH2=OFF CURL_CA_PATH=none) -hunter_config(Boost VERSION 1.66.0) +hunter_config(Boost VERSION 1.77.0) diff --git a/libethcore/Farm.cpp b/libethcore/Farm.cpp index 92478cf64..12d377439 100644 --- a/libethcore/Farm.cpp +++ b/libethcore/Farm.cpp @@ -16,6 +16,7 @@ */ + #include #if ETH_ETHASHCL @@ -382,7 +383,9 @@ void Farm::restart() */ void Farm::restart_async() { - m_io_strand.get_io_service().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); + // m_io_strand.get_io_service().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); + m_io_strand.post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); + } /** diff --git a/libpoolprotocols/CMakeLists.txt b/libpoolprotocols/CMakeLists.txt index f7ef3bca8..907c6c781 100644 --- a/libpoolprotocols/CMakeLists.txt +++ b/libpoolprotocols/CMakeLists.txt @@ -11,5 +11,5 @@ hunter_add_package(OpenSSL) find_package(OpenSSL REQUIRED) add_library(poolprotocols ${SOURCES}) -target_link_libraries(poolprotocols PRIVATE devcore ethminer-buildinfo ethash::ethash Boost::system jsoncpp_lib_static OpenSSL::SSL OpenSSL::Crypto) +target_link_libraries(poolprotocols PRIVATE devcore ethminer-buildinfo ethash::ethash Boost::system jsoncpp_static OpenSSL::SSL OpenSSL::Crypto) target_include_directories(poolprotocols PRIVATE ..) diff --git a/libpoolprotocols/getwork/EthGetworkClient.cpp b/libpoolprotocols/getwork/EthGetworkClient.cpp index 227f7b98e..ad80171e3 100644 --- a/libpoolprotocols/getwork/EthGetworkClient.cpp +++ b/libpoolprotocols/getwork/EthGetworkClient.cpp @@ -103,7 +103,8 @@ void EthGetworkClient::begin_connect() // Eventually endpoints get discarded on connection errors m_endpoint = m_endpoints.front(); m_socket.async_connect( - m_endpoint, m_io_strand.wrap(boost::bind(&EthGetworkClient::handle_connect, this, _1))); + m_endpoint, boost::asio::bind_executor( + m_io_strand.context(), m_io_strand.wrap(boost::bind(&EthGetworkClient::handle_connect, this, placeholders::_1)))); } else {