From 91d58f28bb8cbce06fd717082fa2b4274a33ae07 Mon Sep 17 00:00:00 2001 From: Ruslan Tushov Date: Fri, 27 Aug 2021 18:36:57 +0300 Subject: [PATCH] update hunter, fix protobuf (#163) Signed-off-by: turuslan --- .github/workflows/clang-tidy.yml | 2 +- cmake/Hunter/init.cmake | 4 ++-- cmake/functions.cmake | 2 +- include/libp2p/protocol/gossip/gossip.hpp | 2 +- src/protocol/gossip/impl/stream.hpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 915db144..27f7033d 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: macOS-10.14 + runs-on: macOS-latest steps: - uses: actions/checkout@v1 name: checkout diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake index 78e5a7e3..76ef21f2 100644 --- a/cmake/Hunter/init.cmake +++ b/cmake/Hunter/init.cmake @@ -31,7 +31,7 @@ set( include(${CMAKE_CURRENT_LIST_DIR}/HunterGate.cmake) HunterGate( - URL "https://github.com/soramitsu/soramitsu-hunter/archive/tags/v0.23.257-soramitsu11.tar.gz" - SHA1 "aa48b7125c3400c41c3229647b5a8152f0108470" + URL "https://github.com/soramitsu/soramitsu-hunter/archive/tags/v0.23.257-soramitsu13.tar.gz" + SHA1 "8c88d8bac2dee771926b84a6e28642a267f88ea8" LOCAL ) diff --git a/cmake/functions.cmake b/cmake/functions.cmake index b0a40f8c..afa90dcf 100644 --- a/cmake/functions.cmake +++ b/cmake/functions.cmake @@ -61,7 +61,7 @@ function(compile_proto_to_cpp PROTO_LIBRARY_NAME PB_H PB_CC PROTO) message(FATAL_ERROR "Protobuf_INCLUDE_DIR is empty") endif () - get_filename_component(PROTO_ABS "${PROTO}" REALPATH) + get_filename_component(PROTO_ABS "${PROTO}" ABSOLUTE) # get relative (to CMAKE_BINARY_DIR) path of current proto file file(RELATIVE_PATH SCHEMA_REL "${CMAKE_BINARY_DIR}/src" "${CMAKE_CURRENT_BINARY_DIR}") diff --git a/include/libp2p/protocol/gossip/gossip.hpp b/include/libp2p/protocol/gossip/gossip.hpp index b422ef2a..bcc7a415 100644 --- a/include/libp2p/protocol/gossip/gossip.hpp +++ b/include/libp2p/protocol/gossip/gossip.hpp @@ -31,7 +31,7 @@ namespace libp2p { } } // namespace crypto namespace peer { - class IdentityManager; + struct IdentityManager; } } // namespace libp2p diff --git a/src/protocol/gossip/impl/stream.hpp b/src/protocol/gossip/impl/stream.hpp index 61f0c445..90636e55 100644 --- a/src/protocol/gossip/impl/stream.hpp +++ b/src/protocol/gossip/impl/stream.hpp @@ -52,7 +52,7 @@ namespace libp2p::protocol::gossip { void endWrite(); void asyncPostError(Error error); - const size_t stream_id_; + [[maybe_unused]] const size_t stream_id_; const Time timeout_; basic::Scheduler &scheduler_; const size_t max_message_size_;