[22.x] fs: Make compatible with boost 1.78 #24476

pull fanquake wants to merge 1 commits into bitcoin:22.x from fanquake:22_x_boost_178 changing 2 files +2 −2
  1. fanquake commented at 4:17 PM on March 5, 2022: member

    Backports #24104 to the 22.x branch to fix the build with Boost 1.78.0.

  2. fs: Make compatible with boost 1.78
    Github-Pull: #24104
    Rebased-From: dc5d6b0d4793ca978f71f69ef7d6b818794676c2
    021c3d892f
  3. fanquake requested review from achow101 on Mar 5, 2022
  4. DrahtBot added the label Backport on Mar 5, 2022
  5. in src/wallet/load.cpp:25 in 021c3d892f
      21 | @@ -22,7 +22,7 @@ bool VerifyWallets(interfaces::Chain& chain)
      22 |          fs::path wallet_dir = gArgs.GetArg("-walletdir", "");
      23 |          boost::system::error_code error;
      24 |          // The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory
      25 | -        fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error);
      26 | +        fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator();
    


    hebasto commented at 6:41 PM on March 5, 2022:

    Why this change is required? I see no broken tests on the current 22.x branch (9b5f674abb0e90280436fbacb8711250cde11773) on macOS 12.2.1 (Apple M1).


    achow101 commented at 7:27 PM on March 5, 2022:

    On my system with boost 1.78, the unit tests fail with a trailing backslash in the path here.

  6. achow101 commented at 7:28 PM on March 5, 2022: member

    ACK 021c3d892fb6b801143bb433e85f329fd250c97d

  7. hebasto commented at 7:30 PM on March 5, 2022: member

    ACK 021c3d892fb6b801143bb433e85f329fd250c97d

  8. hebasto approved
  9. fanquake merged this on Mar 7, 2022
  10. fanquake closed this on Mar 7, 2022

  11. fanquake deleted the branch on Mar 7, 2022
  12. fanquake added this to the milestone 22.1 on Mar 7, 2022
  13. DrahtBot locked this on Mar 7, 2023

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-19 03:14 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me