highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-19 06:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge #21415: refactor: remove Optional & nullopt

Browse Source 
ebc4ab721b refactor: post Optional<> removal cleanups (fanquake)
57e980d13c scripted-diff: remove Optional & nullopt (fanquake)

Pull request description:

  Same rationale & motivation as #21404, which turned out to be quite low in the number of potential conflicts. Lets see what the bot has to say here.

ACKs for top commit:
  practicalswift:
    cr ACK ebc4ab721b: patch looks correct
  jnewbery:
    utACK ebc4ab721b
  laanwj:
    Code review ACK ebc4ab721b

Tree-SHA512: 550fbeef09b9d35ddefaa805d1755c18c8fd499c4b0f77ebfece8c20296a7abd1cf6c699e2261f92fe3552deeb7555ec2a2287ffe3ab9e98bb9f8612a4d43be3
This commit is contained in:
Wladimir J. van der Laan
2021-03-17 10:52:16 +01:00
parent 993ecafa5e ebc4ab721b
commit a9d1b40d53
51 changed files with 184 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/net_processing.cpp
View File

@@ -34,6 +34,7 @@
#include <validation.h>
#include <memory>
#include <optional>
#include <typeinfo>
/** How long to cache transactions in mapRelay for normal relay */
@@ -4218,7 +4219,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
if (pto->m_next_local_addr_send != 0us) {
pto->m_addr_known->reset();
}
if (Optional<CAddress> local_addr = GetLocalAddrForPeer(pto)) {
if (std::optional<CAddress> local_addr = GetLocalAddrForPeer(pto)) {
FastRandomContext insecure_rand;
pto->PushAddress(*local_addr, insecure_rand);
}