1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From 200926350748c2d231606884e186a7caa7e60dc4 Mon Sep 17 00:00:00 2001
From: a821 <a821@localhost>
Date: Wed, 18 Sep 2024 11:54:49 +0200
Subject: [PATCH] fix boost 1.84 filesystem deprecations
---
src/wallet/bdb.cpp | 2 +-
src/wallet/walletutil.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
index 85aae0170..76cd27630 100644
--- a/src/wallet/bdb.cpp
+++ b/src/wallet/bdb.cpp
@@ -627,7 +627,7 @@ bool BerkeleyDatabase::Backup(const std::string& strDest) const
return false;
}
- fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists);
+ fs::copy_file(pathSrc, pathDest, fs::copy_options::overwrite_existing);
LogPrintf("copied %s to %s\n", strFile, pathDest.string());
return true;
} catch (const fs::filesystem_error& e) {
diff --git a/src/wallet/walletutil.cpp b/src/wallet/walletutil.cpp
index 88a52cdf6..536ddc4f4 100644
--- a/src/wallet/walletutil.cpp
+++ b/src/wallet/walletutil.cpp
@@ -58,7 +58,7 @@ std::vector<fs::path> ListWalletDir()
(ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) {
// Found a directory which contains wallet.dat btree file, add it as a wallet.
paths.emplace_back(path);
- } else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
+ } else if (it.depth() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
if (it->path().filename() == "wallet.dat") {
// Found top-level wallet.dat btree file, add top level directory ""
// as a wallet.
@@ -73,7 +73,7 @@ std::vector<fs::path> ListWalletDir()
}
} catch (const std::exception& e) {
LogPrintf("%s: Error scanning %s: %s\n", __func__, it->path().string(), e.what());
- it.no_push();
+ it.disable_recursion_pending();
}
}
--
2.46.1
|