From a966b644daba26f044e8747dc33fcef0e1906e0d Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Thu, 15 Aug 2024 21:17:44 -0400 Subject: [PATCH] Changes required for updating to boost 1.86. --- libraries/chain/CMakeLists.txt | 3 ++- plugins/net_plugin/include/eosio/net_plugin/net_utils.hpp | 1 + programs/cleos/CMakeLists.txt | 2 +- tests/trx_generator/http_client_async.hpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt index 6cb6666876..1b0dab0194 100644 --- a/libraries/chain/CMakeLists.txt +++ b/libraries/chain/CMakeLists.txt @@ -149,6 +149,7 @@ add_library( eosio_chain ## Boost::accumulators depends on Boost::numeric_ublas, which is still missing cmake support (see ## https://github.com/boostorg/cmake/issues/39). Until this is fixed, manually add Boost::numeric_ublas ## as an interface library +## ** Remove the two lines below when upgrading to Boost 1.86 or above ** ## ---------------------------------------------------------------------------------------------------- add_library(boost_numeric_ublas INTERFACE) add_library(Boost::numeric_ublas ALIAS boost_numeric_ublas) @@ -156,7 +157,7 @@ add_library(Boost::numeric_ublas ALIAS boost_numeric_ublas) target_link_libraries( eosio_chain PUBLIC bn256 fc chainbase eosio_rapidjson Logging IR WAST WASM softfloat builtins ${CHAIN_EOSVM_LIBRARIES} ${LLVM_LIBS} ${CHAIN_RT_LINKAGE} Boost::signals2 Boost::hana Boost::property_tree Boost::multi_index Boost::asio Boost::lockfree - Boost::assign Boost::accumulators + Boost::assign Boost::accumulators Boost::rational ) target_include_directories( eosio_chain PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" diff --git a/plugins/net_plugin/include/eosio/net_plugin/net_utils.hpp b/plugins/net_plugin/include/eosio/net_plugin/net_utils.hpp index 0cd79d3b06..ecabacab22 100644 --- a/plugins/net_plugin/include/eosio/net_plugin/net_utils.hpp +++ b/plugins/net_plugin/include/eosio/net_plugin/net_utils.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include diff --git a/programs/cleos/CMakeLists.txt b/programs/cleos/CMakeLists.txt index bd45b9bc01..9a9de77fcd 100644 --- a/programs/cleos/CMakeLists.txt +++ b/programs/cleos/CMakeLists.txt @@ -13,7 +13,7 @@ set(LOCALEDOMAIN ${CLI_CLIENT_EXECUTABLE_NAME}) target_include_directories(${CLI_CLIENT_EXECUTABLE_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME} - PRIVATE appbase version spring-cli11 chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} Boost::process Boost::dll ) + PRIVATE appbase version spring-cli11 chain_api_plugin producer_plugin chain_plugin http_plugin eosio_chain fc ${CMAKE_DL_LIBS} ${PLATFORM_SPECIFIC_LIBS} Boost::process Boost::dll Boost::format ) if (CURL_FOUND) target_sources(${CLI_CLIENT_EXECUTABLE_NAME} PRIVATE do_http_post_libcurl.cpp) diff --git a/tests/trx_generator/http_client_async.hpp b/tests/trx_generator/http_client_async.hpp index 4fc754c922..85bd388660 100644 --- a/tests/trx_generator/http_client_async.hpp +++ b/tests/trx_generator/http_client_async.hpp @@ -104,7 +104,7 @@ class session : public std::enable_shared_from_this { }); } - void on_connect(beast::error_code ec, tcp::resolver::results_type::endpoint_type) { + void on_connect(beast::error_code ec, const auto&) { if (ec) { response_callback_(ec, {}); return fail(ec, "connect");