phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-12 12:52:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Use C++17 std::array where possible

Browse source
This commit is contained in:
MarcoFalke 2020-12-04 08:24:51 +01:00
parent a0489f3472
commit fac7ab1d5b
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/qt/sendcoinsdialog.cpp
View file

@ -35,7 +35,7 @@
#include <QSettings> #include <QSettings>
#include <QTextDocument> #include <QTextDocument>
static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} }; static constexpr std::array confTargets{2, 4, 6, 12, 24, 48, 144, 504, 1008};
int getConfTargetForIndex(int index) { int getConfTargetForIndex(int index) {
if (index+1 > static_cast<int>(confTargets.size())) { if (index+1 > static_cast<int>(confTargets.size())) {
return confTargets.back(); return confTargets.back();

2
src/wallet/walletutil.cpp
View file

@ -91,7 +91,7 @@ bool IsFeatureSupported(int wallet_version, int feature_version)
WalletFeature GetClosestWalletFeature(int version) WalletFeature GetClosestWalletFeature(int version)
{ {
const std::array<WalletFeature, 8> wallet_features{{FEATURE_LATEST, FEATURE_PRE_SPLIT_KEYPOOL, FEATURE_NO_DEFAULT_KEY, FEATURE_HD_SPLIT, FEATURE_HD, FEATURE_COMPRPUBKEY, FEATURE_WALLETCRYPT, FEATURE_BASE}}; static constexpr std::array wallet_features{FEATURE_LATEST, FEATURE_PRE_SPLIT_KEYPOOL, FEATURE_NO_DEFAULT_KEY, FEATURE_HD_SPLIT, FEATURE_HD, FEATURE_COMPRPUBKEY, FEATURE_WALLETCRYPT, FEATURE_BASE};
for (const WalletFeature& wf : wallet_features) { for (const WalletFeature& wf : wallet_features) {
if (version >= wf) return wf; if (version >= wf) return wf;
} }