From 30c695009626779ca31a8f037a498b606d046402 Mon Sep 17 00:00:00 2001 From: Steve Gerbino Date: Mon, 8 Apr 2024 20:17:03 +0200 Subject: [PATCH 1/2] Bump chain version and cmake version --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2fd6469..eccbf407 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,13 +6,13 @@ include(FetchContent) FetchContent_Declare( koinos_cmake GIT_REPOSITORY https://github.com/koinos/koinos-cmake.git - GIT_TAG v1.0.1) + GIT_TAG v1.0.2) FetchContent_MakeAvailable(koinos_cmake) include("${koinos_cmake_SOURCE_DIR}/Koinos.cmake") project(koinos_chain - VERSION 1.2.0 + VERSION 1.3.0 DESCRIPTION "Koinos Chain microservice" LANGUAGES CXX C) From b2f7ae52b5188396593a88e8e2afdef125506b6c Mon Sep 17 00:00:00 2001 From: Steve Gerbino Date: Mon, 8 Apr 2024 22:13:29 +0200 Subject: [PATCH 2/2] Wrap deprecated functions to prevent GCC warning --- src/koinos_chain.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/koinos_chain.cpp b/src/koinos_chain.cpp index 30febcb8..fe1360b8 100644 --- a/src/koinos_chain.cpp +++ b/src/koinos_chain.cpp @@ -423,9 +423,12 @@ void attach_request_handler( chain::controller& controller, mq::request_handler& auto j = e.get_json(); j[ "code" ] = e.get_code(); +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" error->set_data( j.dump() ); +#pragma GCC diagnostic pop #pragma clang diagnostic pop chain::error_details details; @@ -444,9 +447,12 @@ void attach_request_handler( chain::controller& controller, mq::request_handler& nlohmann::json j; j[ "code" ] = chain::internal_error; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" error->set_data( j.dump() ); +#pragma GCC diagnostic pop #pragma clang diagnostic pop chain::error_details details; @@ -462,9 +468,12 @@ void attach_request_handler( chain::controller& controller, mq::request_handler& nlohmann::json j; j[ "code" ] = chain::internal_error; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" error->set_data( j.dump() ); +#pragma GCC diagnostic pop #pragma clang diagnostic pop chain::error_details details; @@ -481,9 +490,12 @@ void attach_request_handler( chain::controller& controller, mq::request_handler& nlohmann::json j; j[ "code" ] = chain::internal_error; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" error->set_data( j.dump() ); +#pragma GCC diagnostic pop #pragma clang diagnostic pop chain::error_details details;