Fix build with Boost 1.77.0 #22713
pull sizeofvoid wants to merge 1 commits into bitcoin:master from sizeofvoid:boost-1770 changing 3 files +12 −0-
sizeofvoid commented at 4:38 am on August 16, 2021: contributorBOOST_FILESYSTEM_C_STR changed to accept the path as an argument.
-
sizeofvoid commented at 4:38 am on August 16, 2021: contributorThis will fix https://github.com/bitcoin/bitcoin/issues/22482
-
fanquake commented at 4:44 am on August 16, 2021: member
Concept ACK.
Even though we will hopefully be removing Boost Filesystem in master (#20744), fixing this is still needed, as we’ll have to at least backport the change to
22.x
and0.21
, as users building those branches being using newer Boost versions. -
bob-beck referenced this in commit 965435c36d on Aug 16, 2021
-
bob-beck referenced this in commit 5ce49197de on Aug 16, 2021
-
DrahtBot added the label Wallet on Aug 16, 2021
-
MarcoFalke removed the label Wallet on Aug 16, 2021
-
MarcoFalke added the label Build system on Aug 16, 2021
-
MarcoFalke added the label Needs backport (0.21) on Aug 16, 2021
-
MarcoFalke added the label Needs backport (22.x) on Aug 16, 2021
-
MarcoFalke commented at 8:34 am on August 16, 2021: memberLooks like boost 1.77 was released with this, so Concept ACK. Didn’t test with that boost version, though.
-
DrahtBot commented at 8:41 am on August 16, 2021: member
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Conflicts
No conflicts as of last run.
-
in src/fs.cpp:246 in 5825876a23 outdated
241@@ -242,7 +242,11 @@ void ofstream::close() 242 } 243 #else // __GLIBCXX__ 244 245+#if BOOST_VERSION >= 107700 246+static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t),
laanwj commented at 12:24 pm on August 18, 2021:Wouldn’t
0static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t),
communicate the intent here better?
hebasto commented at 9:46 am on August 20, 2021:Agree.
The member access operator has higher precedence than the indirection operator.
sizeofvoid commented at 8:04 am on August 24, 2021:Agree!hebasto commented at 7:58 am on August 20, 2021: memberConcept ACK.sizeofvoid force-pushed on Aug 24, 2021hebasto commented at 8:19 am on August 24, 2021: memberSorry, but it looks like you changed the wrong line in your recent push. No need to change the old
static_assert
. Only the new one should be fixed.sizeofvoid force-pushed on Aug 24, 2021sizeofvoid commented at 8:50 am on August 24, 2021: contributorSorry, but it looks like you changed the wrong line in your recent push. No need to change the old
static_assert
. Only the new one should be fixed.Ops, sorry. Fixed!
hebasto commented at 9:05 am on August 24, 2021: memberACK acb7aad27ec8a184808aa7905887e3b2c5d54e9cFix build with Boost 1.77.0
BOOST_FILESYSTEM_C_STR changed to accept the path as an argument
benthecarman approvedbenthecarman commented at 4:59 pm on August 25, 2021: contributorACK acb7aad27ec8a184808aa7905887e3b2c5d54e9cfanquake approvedfanquake commented at 8:16 am on August 26, 2021: memberACK acb7aad27ec8a184808aa7905887e3b2c5d54e9c - tested the fix with Boost 1.77.0 and 1.71.0.fanquake merged this on Aug 26, 2021fanquake closed this on Aug 26, 2021
hebasto referenced this in commit 32e1424f84 on Aug 26, 2021hebasto removed the label Needs backport (22.x) on Aug 26, 2021laanwj referenced this in commit 4a25e39624 on Aug 26, 2021hebasto referenced this in commit f5180d2317 on Aug 26, 2021hebasto removed the label Needs backport (0.21) on Aug 26, 2021hebasto referenced this in commit d9b18c1290 on Aug 27, 2021fujicoin referenced this in commit f8c21deb34 on Aug 27, 2021fanquake referenced this in commit 6ebb9d0e46 on Aug 28, 2021sidhujag referenced this in commit 81e8b88185 on Aug 28, 2021Fabcien referenced this in commit 868322caea on Jan 6, 2022pkvk referenced this in commit cf85109bfc on Feb 9, 2022PastaPastaPasta referenced this in commit 92230c754b on Mar 13, 2022gwillen referenced this in commit 18cee94832 on Jul 27, 2022gwillen referenced this in commit 45898781ec on Aug 1, 2022apoelstra referenced this in commit e295862057 on Aug 14, 2022PiRK referenced this in commit c12bafcfed on Aug 16, 2022schancel referenced this in commit 0c207a7270 on Aug 17, 2022DrahtBot locked this on Aug 26, 2022
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: 2024-11-17 12:12 UTC
More mirrored repositories can be found on mirror.b10c.me