diff options
| author | maskoficarus <[email protected]> | 2020-09-20 19:07:28 -0500 |
|---|---|---|
| committer | maskoficarus <[email protected]> | 2020-09-29 22:08:54 -0500 |
| commit | 95fedd33a23d6cb7542378afef229965f1ebfd68 (patch) | |
| tree | 8fd2b35beb6704161bef5ac9af0e5c4b979a61e3 /src/wallet/scriptpubkeyman.cpp | |
| parent | Merge #19781: test: add parameterized constructor for msg_sendcmpct() (diff) | |
| download | discoin-95fedd33a23d6cb7542378afef229965f1ebfd68.tar.xz discoin-95fedd33a23d6cb7542378afef229965f1ebfd68.zip | |
refactor: Clean up -Wlogical-op warning
This commit fixes #19912 by removing a check that always returned true. That check was causing a -Wlogical-op warning because it treated a constant int as though it were a boolean.
Diffstat (limited to 'src/wallet/scriptpubkeyman.cpp')
| -rw-r--r-- | src/wallet/scriptpubkeyman.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 51715462c..c0c487f63 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -452,7 +452,7 @@ bool LegacyScriptPubKeyMan::Upgrade(int prev_version, bilingual_str& error) hd_upgrade = true; } // Upgrade to HD chain split if necessary - if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT) && CHDChain::VERSION_HD_CHAIN_SPLIT) { + if (m_storage.CanSupportFeature(FEATURE_HD_SPLIT)) { WalletLogPrintf("Upgrading wallet to use HD chain split\n"); m_storage.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL); split_upgrade = FEATURE_HD_SPLIT > prev_version; |