Attachment 255324 Details for Bug 282875 – fix function calls instead of using BOOST_FILESYSTEM_NO_DEPRECATED

fix function calls instead of using BOOST_FILESYSTEM_NO_DEPRECATED

file_282875.txt (text/plain), 1.66 KB, created by adrian on 2024-11-20 14:31:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: adrian

Created: 2024-11-20 14:31:41 UTC

Size: 1.66 KB

patch

obsolete

>--- src/wallet/bdb.cpp  2024-03-28 17:05:26.000000000 +0000
>+++ src/wallet/bdb.cpp  2024-11-20 13:23:51.628575000 +0000
>@@ -627,7 +627,7 @@
>                         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) {
>--- src/wallet/walletutil.cpp   2024-03-28 17:05:26.000000000 +0000
>+++ src/wallet/walletutil.cpp   2024-11-20 13:28:06.157704000 +0000
>@@ -58,7 +58,7 @@
>                 (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 @@
>             }
>         } 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();
>         }
>     }

Actions: View

Attachments on bug 282875: 255324 | 255325 | 255326