diff options
| author | Karl-Johan Alm <[email protected]> | 2019-05-24 14:55:27 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <[email protected]> | 2019-05-29 18:23:45 +0900 |
| commit | 129a5bafd9a3efa2fa16d780885048a06566d262 (patch) | |
| tree | 0d2897fb378f8fae086601605c7dfce4ac0525f3 | |
| parent | Merge #16113: gui: move coin control "OK" to the right hand side of the dialog (diff) | |
| download | discoin-129a5bafd9a3efa2fa16d780885048a06566d262.tar.xz discoin-129a5bafd9a3efa2fa16d780885048a06566d262.zip | |
wallet: rename g_known_wallet_flags constant to KNOWN_WALLET_FLAGS
| -rw-r--r-- | src/wallet/wallet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index e86147b5d..554090a4c 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1571,7 +1571,7 @@ bool CWallet::SetWalletFlags(uint64_t overwriteFlags, bool memonly) { LOCK(cs_wallet); m_wallet_flags = overwriteFlags; - if (((overwriteFlags & g_known_wallet_flags) >> 32) ^ (overwriteFlags >> 32)) { + if (((overwriteFlags & KNOWN_WALLET_FLAGS) >> 32) ^ (overwriteFlags >> 32)) { // contains unknown non-tolerable wallet flags return false; } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 87aff0903..56046e421 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -139,7 +139,7 @@ enum WalletFlags : uint64_t { WALLET_FLAG_BLANK_WALLET = (1ULL << 33), }; -static constexpr uint64_t g_known_wallet_flags = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_KEY_ORIGIN_METADATA; +static constexpr uint64_t KNOWN_WALLET_FLAGS = WALLET_FLAG_DISABLE_PRIVATE_KEYS | WALLET_FLAG_BLANK_WALLET | WALLET_FLAG_KEY_ORIGIN_METADATA; /** A key from a CWallet's keypool * |