sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

partial bitcoin#25472: Increase MS Visual Studio minimum version

Browse Source 
contains:
- 630c1711 (excl. changes to mempool as they haven't been backported
  yet)
This commit is contained in:
Kittywhiskers Van Gogh 2024-08-30 19:57:59 +00:00
parent 54bb3a438f
commit 6d4945418a
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
3 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -338,7 +338,6 @@ BITCOIN_CORE_H = \
util/bip32.h \ util/bip32.h \
util/bytevectorhash.h \ util/bytevectorhash.h \
util/check.h \ util/check.h \
util/designator.h \
util/edge.h \ util/edge.h \
util/enumerate.h \ util/enumerate.h \
util/epochguard.h \ util/epochguard.h \

29
src/net.cpp
View File

@ -28,7 +28,6 @@
#include <protocol.h> #include <protocol.h>
#include <random.h> #include <random.h>
#include <scheduler.h> #include <scheduler.h>
#include <util/designator.h>
#include <util/sock.h> #include <util/sock.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <util/system.h> #include <util/system.h>
@ -1104,20 +1103,20 @@ bool CConnman::AttemptToEvictConnection()
} }
NodeEvictionCandidate candidate{ NodeEvictionCandidate candidate{
Desig(id) node->GetId(), .id = node->GetId(),
Desig(m_connected) node->m_connected, .m_connected = node->m_connected,
Desig(m_min_ping_time) node->m_min_ping_time, .m_min_ping_time = node->m_min_ping_time,
Desig(m_last_block_time) node->m_last_block_time, .m_last_block_time = node->m_last_block_time,
Desig(m_last_tx_time) node->m_last_tx_time, .m_last_tx_time = node->m_last_tx_time,
Desig(fRelevantServices) node->m_has_all_wanted_services, .fRelevantServices = node->m_has_all_wanted_services,
Desig(m_relay_txs) node->m_relays_txs.load(), .m_relay_txs = node->m_relays_txs.load(),
Desig(fBloomFilter) node->m_bloom_filter_loaded.load(), .fBloomFilter = node->m_bloom_filter_loaded.load(),
Desig(nKeyedNetGroup) node->nKeyedNetGroup, .nKeyedNetGroup = node->nKeyedNetGroup,
Desig(prefer_evict) node->m_prefer_evict, .prefer_evict = node->m_prefer_evict,
Desig(m_is_local) node->addr.IsLocal(), .m_is_local = node->addr.IsLocal(),
Desig(m_network) node->ConnectedThroughNetwork(), .m_network = node->ConnectedThroughNetwork(),
Desig(m_noban) node->HasPermission(NetPermissionFlags::NoBan), .m_noban = node->HasPermission(NetPermissionFlags::NoBan),
Desig(m_conn_type) node->m_conn_type, .m_conn_type = node->m_conn_type,
}; };
vEvictionCandidates.push_back(candidate); vEvictionCandidates.push_back(candidate);
} }

21
src/util/designator.h
View File

@ -1,21 +0,0 @@
// Copyright (c) 2022 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_UTIL_DESIGNATOR_H
#define BITCOIN_UTIL_DESIGNATOR_H
/**
* Designated initializers can be used to avoid ordering mishaps in aggregate
* initialization. However, they do not prevent uninitialized members. The
* checks can be disabled by defining DISABLE_DESIGNATED_INITIALIZER_ERRORS.
* This should only be needed on MSVC 2019. MSVC 2022 supports them with the
* option "/std:c++20"
*/
#ifndef DISABLE_DESIGNATED_INITIALIZER_ERRORS
#define Desig(field_name) .field_name =
#else
#define Desig(field_name)
#endif
#endif // BITCOIN_UTIL_DESIGNATOR_H