From 46f6e29efbc99b6af6185609c344e4e7d1da3c5c Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 16 Jan 2025 04:23:04 +0100 Subject: [PATCH 1/2] fixed gcc 13 compilation + some warnings --- contrib/epee/include/gzip_encoding.h | 2 +- src/currency_core/currency_format_utils.cpp | 2 +- src/currency_core/genesis.cpp | 4 +--- src/currency_core/genesis.h | 14 +++++--------- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/contrib/epee/include/gzip_encoding.h b/contrib/epee/include/gzip_encoding.h index e2e1ea2c..6c27c5a8 100644 --- a/contrib/epee/include/gzip_encoding.h +++ b/contrib/epee/include/gzip_encoding.h @@ -182,7 +182,7 @@ namespace net_utils * */ inline - virtual void stop(std::string& OUT collect_remains) + virtual void stop(std::string& OUT collect_remains) override { } protected: diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 96d55b46..60024b71 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -4274,7 +4274,7 @@ namespace currency { payment_id.clear(); blobdata blob; - uint64_t prefix; + uint64_t prefix{}; if (!tools::base58::decode_addr(str, prefix, blob)) { LOG_PRINT_L1("Invalid address format: base58 decoding failed for \"" << str << "\""); diff --git a/src/currency_core/genesis.cpp b/src/currency_core/genesis.cpp index a58dcb4e..5c5435a5 100644 --- a/src/currency_core/genesis.cpp +++ b/src/currency_core/genesis.cpp @@ -1,8 +1,7 @@ -// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2025 Zano Project // Copyright (c) 2014-2018 The Louisdor Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "genesis.h" namespace currency @@ -17,4 +16,3 @@ namespace currency {0x00,0x00}}; #endif } - diff --git a/src/currency_core/genesis.h b/src/currency_core/genesis.h index 8ea77d89..1c025c90 100644 --- a/src/currency_core/genesis.h +++ b/src/currency_core/genesis.h @@ -1,11 +1,11 @@ -// Copyright (c) 2014-2018 Zano Project -// Copyright (c) 2014-2018 Zano Project +// Copyright (c) 2014-2025 Zano Project // Copyright (c) 2014-2018 The Louisdor Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#pragma once +#pragma once #include +#include + namespace currency { #pragma pack(push, 1) @@ -17,7 +17,7 @@ namespace currency }; #else - struct genesis_tx_raw_data + struct genesis_tx_raw_data { uint64_t const v[42]; uint8_t const r[2]; @@ -26,7 +26,3 @@ namespace currency #pragma pack(pop) extern const genesis_tx_raw_data ggenesis_tx_raw; } - - - - From 93c6c2a0b34c1a2da86e97a8721793181b895bea Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 16 Jan 2025 05:40:28 +0100 Subject: [PATCH 2/2] more compilation fixed for gcc --- src/wallet/plain_wallet_api.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/wallet/plain_wallet_api.h b/src/wallet/plain_wallet_api.h index f12eba03..84fe46ae 100644 --- a/src/wallet/plain_wallet_api.h +++ b/src/wallet/plain_wallet_api.h @@ -1,11 +1,10 @@ -// Copyright (c) 2014-2020 Zano Project +// Copyright (c) 2014-2025 Zano Project // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - - #pragma once #include +#include #include "../common/error_codes.h" namespace plain_wallet