From 7ffea4348f1d42924ac58c4c7a08d5f3025739df Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Sat, 20 Jul 2024 11:40:53 +0000 Subject: [PATCH] merge bitcoin#24104: Make compatible with boost 1.78 --- src/fs.h | 2 +- src/wallet/load.cpp | 2 +- test/functional/wallet_multiwallet.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fs.h b/src/fs.h index 80dd2c03d3..241097124c 100644 --- a/src/fs.h +++ b/src/fs.h @@ -88,7 +88,7 @@ static inline auto quoted(const std::string& s) // Allow safe path append operations. static inline path operator+(path p1, path p2) { - p1 += std::move(p2); + p1 += static_cast(p2); return p1; } diff --git a/src/wallet/load.cpp b/src/wallet/load.cpp index 8dbc18aa27..71997c2481 100644 --- a/src/wallet/load.cpp +++ b/src/wallet/load.cpp @@ -25,7 +25,7 @@ bool VerifyWallets(interfaces::Chain& chain) fs::path wallet_dir = fs::PathFromString(gArgs.GetArg("-walletdir", "")); boost::system::error_code error; // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory - fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error); + fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator(); if (error || !fs::exists(wallet_dir)) { chain.initError(strprintf(_("Specified -walletdir \"%s\" does not exist"), fs::PathToString(wallet_dir))); return false; diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index dc095fcaf1..0ae961db0b 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -141,7 +141,7 @@ class MultiWalletTest(BitcoinTestFramework): # should raise rpc error if wallet path can't be created err_code = -4 if self.options.descriptors else -1 - assert_raises_rpc_error(err_code, "boost::filesystem::create_directory:", self.nodes[0].createwallet, "w8/bad") + assert_raises_rpc_error(err_code, "boost::filesystem::create_director", self.nodes[0].createwallet, "w8/bad") # check that all requested wallets were created self.stop_node(0)