aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2019-06-26 10:36:16 +0800
committerfanquake <fanquake@gmail.com>2019-06-26 10:53:33 +0800
commitca80fec973f0895b3d150b5af472d778102c315d (patch)
tree14b7fed042f62cc8782732a26984f7b68a7cb228
parent332c6134bb15384e5b91c631e821fe52a591d3bc (diff)
parentd8bd97d5ee766a75dec016203bd4d4aafcc24c4f (diff)
Merge #16286: refactoring: wallet: Fix GCC 7.4.0 warning
d8bd97d5ee766a75dec016203bd4d4aafcc24c4f Fix GCC 7.4.0 warning (Hennadii Stepanov) Pull request description: Having #13756 and #16239 merged cause GCC warning: ``` $ gcc --version gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 ... $ make -j 4 > /dev/null wallet/wallet.cpp: In member function ‘CWallet::Balance CWallet::GetBalance(int, bool) const’: wallet/wallet.cpp:2269:45: warning: enumeral and non-enumeral type in conditional expression [-Wextra] isminefilter reuse_filter = avoid_reuse ? 0 : ISMINE_USED; ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ ``` Fixed with this PR. ACKs for top commit: practicalswift: utACK d8bd97d5ee766a75dec016203bd4d4aafcc24c4f promag: ACK d8bd97d. kallewoof: utACK d8bd97d5ee766a75dec016203bd4d4aafcc24c4f meshcollider: Trivial utACK https://github.com/bitcoin/bitcoin/pull/16286/commits/d8bd97d5ee766a75dec016203bd4d4aafcc24c4f Tree-SHA512: 2fb315ac82f290c8b9f4e48d1b4526b9babe0717c68593c7bc55cd6c289e64b6322aba72984f39291a9254b57d3f6ba8dbfe03799f510c0c1dc108b21b286732
-rw-r--r--src/wallet/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 0472334bc1..16366a0c23 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2266,7 +2266,7 @@ void MaybeResendWalletTxs()
CWallet::Balance CWallet::GetBalance(const int min_depth, bool avoid_reuse) const
{
Balance ret;
- isminefilter reuse_filter = avoid_reuse ? 0 : ISMINE_USED;
+ isminefilter reuse_filter = avoid_reuse ? ISMINE_NO : ISMINE_USED;
{
auto locked_chain = chain().lock();
LOCK(cs_wallet);