Skip to content

Commit

Permalink
Revert "Build: Upgrade boost dependency to version 1.83 (#2696)"
Browse files Browse the repository at this point in the history
This reverts commit b4713b7.
  • Loading branch information
Bushstar committed Nov 21, 2023
1 parent b4713b7 commit 75d67f1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions depends/packages/boost.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ package=boost
# Official version hashes
# 77: fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
# 78: 8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
# 83: 6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e

$(package)_version=1_83_0
$(package)_sha256_hash=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
$(package)_version=1_77_0
$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854

$(package)_version_dot=$(subst _,.,$($(package)_version))
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version_dot)/source/
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ bool BerkeleyDatabase::Backup(const std::string& strDest)
return false;
}

fs::copy_file(pathSrc, pathDest, fs::copy_options::overwrite_existing);
fs::copy_file(pathSrc, pathDest, fs::copy_option::overwrite_if_exists);
LogPrintf("copied %s to %s\n", strFile, pathDest.string());
return true;
} catch (const fs::filesystem_error& e) {
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/test/init_test_fixture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam
m_datadir = GetDataDir();
m_cwd = fs::current_path();

m_walletdir_path_cases["default"] = m_datadir / "wallets/";
m_walletdir_path_cases["default"] = m_datadir / "wallets";
m_walletdir_path_cases["custom"] = m_datadir / "my_wallets";
m_walletdir_path_cases["nonexistent"] = m_datadir / "path_does_not_exist";
m_walletdir_path_cases["file"] = m_datadir / "not_a_directory.dat";
Expand Down
2 changes: 1 addition & 1 deletion test/functional/wallet_multiwallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def wallet_file(name):
assert_equal(os.path.isfile(wallet_file(wallet_name)), True)

# should not initialize if wallet path can't be created
exp_stderr = "boost::filesystem::create_directories:"
exp_stderr = "boost::filesystem::create_directory:"
self.nodes[0].assert_start_raises_init_error(
["-wallet=wallet.dat/bad"], exp_stderr, match=ErrorMatch.PARTIAL_REGEX
)
Expand Down

0 comments on commit 75d67f1

Please sign in to comment.