Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented May 11, 2020

Closes #18943

MarcoFalke added 2 commits May 11, 2020 09:53
… of T{}

Optional::emplace() was only added in boost 1.56, see
boostorg/optional@2e583aa

To simply work around bitcoin#18943,
replace it with assignment of T{}
pwallet is never null everywhere where it is dereferenced, so simply
replace it with a reference, which can not be null by definition.
Copy link
Contributor

@ryanofsky ryanofsky left a comment

Choose a reason for hiding this comment

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

Code review ACK fa1f840 and thanks for using a standalone commit for the fix

@DrahtBot
Copy link
Contributor

DrahtBot commented May 11, 2020

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

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.

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

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

Code review ACK fa1f840.

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK fa1f840, tested on Linux Mint 19.3.

@laanwj
Copy link
Member

laanwj commented May 14, 2020

ACK fa1f840

@laanwj laanwj merged commit 4dd2e52 into bitcoin:master May 14, 2020
@maflcko maflcko deleted the 2005-rpcWalletOptional branch May 14, 2020 22:31
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request May 17, 2020
…ith simple assignment of T{}

fa1f840 rpcwallet: Replace pwallet-> with wallet. (MarcoFalke)
fa182a8 rpcwallet: Replace boost::optional<T>::emplace with simple assignment of T{} (MarcoFalke)

Pull request description:

  Closes bitcoin#18943

ACKs for top commit:
  laanwj:
    ACK fa1f840
  ryanofsky:
    Code review ACK fa1f840 and thanks for using a standalone commit for the fix
  promag:
    Code review ACK fa1f840.
  hebasto:
    ACK fa1f840, tested on Linux Mint 19.3.

Tree-SHA512: 0838485d1f93f737ce5bf12740669dcafeebb78dbc3fa15dbcc511edce64bf024f60f0497a04149a1e799d893d57b0c9ffe442020c1b9cfc3c69db731f50e712
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Jan 29, 2021
Summary:
> rpcwallet: Replace boost::optional<T>::emplace with simple assignment of T{}
>
> Optional::emplace() was only added in boost 1.56, see
> boostorg/optional@2e583aa
>
> To simply work around bitcoin/bitcoin#18943,
> replace it with assignment of T{}
bitcoin/bitcoin@fa1f840
Backport note: Bitcoin ABC already enforces boost > 1.59, and uses `std::optional` anyway, so this first commit
is included only for future backporting convenience.

----------------------

> rpcwallet: Replace pwallet-> with wallet.
>
> pwallet is never null everywhere where it is dereferenced, so simply
> replace it with a reference, which can not be null by definition.
bitcoin/bitcoin@fa1f840

-----------

This is a backport of Core [[bitcoin/bitcoin#18946 | PR18946]]

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, majcosta

Reviewed By: #bitcoin_abc, majcosta

Differential Revision: https://reviews.bitcoinabc.org/D9112
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

What is the minimum supported version of boost for 0.21.0?
6 participants