Skip to content

Commit ca80fec

Browse files
committed
Merge #16286: refactoring: wallet: Fix GCC 7.4.0 warning
d8bd97d 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 d8bd97d promag: ACK d8bd97d. kallewoof: utACK d8bd97d meshcollider: Trivial utACK bitcoin/bitcoin@d8bd97d Tree-SHA512: 2fb315ac82f290c8b9f4e48d1b4526b9babe0717c68593c7bc55cd6c289e64b6322aba72984f39291a9254b57d3f6ba8dbfe03799f510c0c1dc108b21b286732
2 parents 332c613 + d8bd97d commit ca80fec

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/wallet/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ void MaybeResendWalletTxs()
22662266
CWallet::Balance CWallet::GetBalance(const int min_depth, bool avoid_reuse) const
22672267
{
22682268
Balance ret;
2269-
isminefilter reuse_filter = avoid_reuse ? 0 : ISMINE_USED;
2269+
isminefilter reuse_filter = avoid_reuse ? ISMINE_NO : ISMINE_USED;
22702270
{
22712271
auto locked_chain = chain().lock();
22722272
LOCK(cs_wallet);

0 commit comments

Comments
 (0)