From 4c720ebd82b33dcc0cdbecfed1088610138c1825 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 27 May 2022 19:50:21 +0200 Subject: [PATCH] various compilation and warning fixes for gcc --- src/CMakeLists.txt | 2 +- tests/core_tests/double_spend.inl | 2 +- tests/core_tests/tx_validation.h | 2 +- tests/performance_tests/core_market_performance_test.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da31da22..734f695f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -174,7 +174,7 @@ ENABLE_SHARED_PCH_EXECUTABLE(connectivity_tool) add_executable(simplewallet ${SIMPLEWALLET}) add_dependencies(simplewallet version) -target_link_libraries(simplewallet wallet rpc currency_core crypto common zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES}) +target_link_libraries(simplewallet wallet rpc currency_core crypto common zlibstatic ethash ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES} dl) ENABLE_SHARED_PCH(simplewallet SIMPLEWALLET) ENABLE_SHARED_PCH_EXECUTABLE(simplewallet) diff --git a/tests/core_tests/double_spend.inl b/tests/core_tests/double_spend.inl index 3b557131..0c807bb3 100644 --- a/tests/core_tests/double_spend.inl +++ b/tests/core_tests/double_spend.inl @@ -95,7 +95,7 @@ bool gen_double_spend_in_tx::generate(std::vector attachments; - if (!construct_tx(bob_account.get_keys(), sources, destinations, attachments, tx_1, get_tx_version_from_events(events), uint64_t(0))) + if (!construct_tx(bob_account.get_keys(), sources, destinations, attachments, tx_1, this->get_tx_version_from_events(events), uint64_t(0))) return false; SET_EVENT_VISITOR_SETT(events, event_visitor_settings::set_txs_kept_by_block, txs_kept_by_block); diff --git a/tests/core_tests/tx_validation.h b/tests/core_tests/tx_validation.h index 15a5d0ad..7bf494bd 100644 --- a/tests/core_tests/tx_validation.h +++ b/tests/core_tests/tx_validation.h @@ -125,7 +125,7 @@ struct gen_tx_extra_double_entry : test_chain_unit_enchanced { gen_tx_extra_double_entry(); bool generate(std::vector& events) const; - bool gen_tx_extra_double_entry::configure_core(currency::core& c, size_t ev_index, const std::vector& events); + bool configure_core(currency::core& c, size_t ev_index, const std::vector& events); }; struct gen_tx_double_key_image : test_chain_unit_enchanced diff --git a/tests/performance_tests/core_market_performance_test.cpp b/tests/performance_tests/core_market_performance_test.cpp index d6c8bbe1..9f19e193 100644 --- a/tests/performance_tests/core_market_performance_test.cpp +++ b/tests/performance_tests/core_market_performance_test.cpp @@ -60,7 +60,7 @@ std::string get_random_rext(size_t len) { std::string buff(len/2, 0); crypto::generate_random_bytes(len/2, (void*)buff.data()); - return string_tools::buff_to_hex_nodelimer(buff); + return epst::buff_to_hex_nodelimer(buff); } bool run_core_market_performance_tests(uint64_t offers_amount)