Skip to content
This repository was archived by the owner on Apr 24, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ node_modules/

# vscode
.vscode/
/.vs
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
15 changes: 15 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -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": ""
}
]
}
2 changes: 1 addition & 1 deletion cmake/Hunter/config.cmake
Original file line number Diff line number Diff line change
@@ -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)
5 changes: 4 additions & 1 deletion libethcore/Farm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/



#include <libethcore/Farm.h>

#if ETH_ETHASHCL
Expand Down Expand Up @@ -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)));

}

/**
Expand Down
2 changes: 1 addition & 1 deletion libpoolprotocols/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our linker can't find jsoncpp anymore now. Please mention changes like these in a changelog, readme or similar.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated in e55fbdc

target_include_directories(poolprotocols PRIVATE ..)
3 changes: 2 additions & 1 deletion libpoolprotocols/getwork/EthGetworkClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down