Skip to content

Commit fac7ab1

Browse files
author
MarcoFalke
committed
refactor: Use C++17 std::array where possible
1 parent a0489f3 commit fac7ab1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <QSettings>
3636
#include <QTextDocument>
3737

38-
static const std::array<int, 9> confTargets = { {2, 4, 6, 12, 24, 48, 144, 504, 1008} };
38+
static constexpr std::array confTargets{2, 4, 6, 12, 24, 48, 144, 504, 1008};
3939
int getConfTargetForIndex(int index) {
4040
if (index+1 > static_cast<int>(confTargets.size())) {
4141
return confTargets.back();

src/wallet/walletutil.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bool IsFeatureSupported(int wallet_version, int feature_version)
9191

9292
WalletFeature GetClosestWalletFeature(int version)
9393
{
94-
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}};
94+
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};
9595
for (const WalletFeature& wf : wallet_features) {
9696
if (version >= wf) return wf;
9797
}

0 commit comments

Comments
 (0)