Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opportunistic 1p1c followups #30012

Merged
merged 6 commits into from
May 3, 2024
Merged

Conversation

@DrahtBot
Copy link
Contributor

DrahtBot commented May 1, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK instagibbs

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #29641 (scripted-diff: Use LogInfo/LogDebug over LogPrintf/LogPrint by maflcko)
  • #28984 (Cluster size 2 package rbf by instagibbs)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@glozow glozow mentioned this pull request May 1, 2024
56 tasks
Copy link
Member

@instagibbs instagibbs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6119f76

@fanquake
Copy link
Member

fanquake commented May 2, 2024

Can this also address:

txorphanage.cpp:281:21: error: loop variable 'child_iter' creates a copy from type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const' [-Werror,-Wrange-loop-construct]
  281 |     for (const auto child_iter : iters) {
      |                     ^
txorphanage.cpp:281:10: note: use reference type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const &' to prevent copying
  281 |     for (const auto child_iter : iters) {
      |          ^~~~~~~~~~~~~~~~~~~~~~~
      |                     &
txorphanage.cpp:313:21: error: loop variable 'child_iter' creates a copy from type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const' [-Werror,-Wrange-loop-construct]
  313 |     for (const auto child_iter : iters) {
      |                     ^
txorphanage.cpp:313:10: note: use reference type '__gnu_debug::_Safe_iterator<std::_Rb_tree_iterator<std::pair<const transaction_identifier<false>, TxOrphanage::OrphanTx>>, std::map<transaction_identifier<false>, TxOrphanage::OrphanTx>> const &' to prevent copying
  313 |     for (const auto child_iter : iters) {
      |          ^~~~~~~~~~~~~~~~~~~~~~~
      |                     &

@glozow
Copy link
Member Author

glozow commented May 2, 2024

Can this also address:

Added. I made a copy instead of reference because it's a pointer.

@instagibbs
Copy link
Member

reACK 7f6fb73

just the non-pointer copying added

@fanquake fanquake merged commit 99d7538 into bitcoin:master May 3, 2024
16 checks passed
@glozow glozow deleted the 2024-05-1p1c-followups branch May 9, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants