mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-19 09:53:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#25641: Fix -Wparentheses gcc warning

Browse Source 
d68ca4ef64 Fix `-Wparentheses` gcc warning (Hennadii Stepanov)

Pull request description:

  This PR fixes `-Wparentheses` gcc warning which has been introduced in bitcoin/bitcoin#25624.

  On the master branch (6d8707b21d):
  ```
  $ gcc --version
  gcc (Ubuntu 11.2.0-19ubuntu1) 11.2.0
  Copyright (C) 2021 Free Software Foundation, Inc.
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

  $ make > /dev/null
  In file included from ./net.h:29,
                   from ./net_processing.h:9,
                   from test/fuzz/txorphan.cpp:7:
  test/fuzz/txorphan.cpp: In lambda function:
  test/fuzz/txorphan.cpp:116:70: warning: suggest parentheses around comparison in operand of ‘==’ [-Wparentheses]
    116 |                         Assert(!have_tx == GetTransactionWeight(*tx) > MAX_STANDARD_TX_WEIGHT);
        |                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
  ./util/check.h:74:50: note: in definition of macro ‘Assert’
     74 | #define Assert(val) inline_assertion_check<true>(val, __FILE__, __LINE__, __func__, #val)
        |                                                  ^~~
  ```

ACKs for top commit:
  MarcoFalke:
    ACK d68ca4ef64

Tree-SHA512: 5c98df4d6a6124d048b16eb3caf29bb396223d3394c1f48efc0fe0c8fd334d67dbf64d0b2e40faf9eda6f6a537885abcff05c61e410cfb317737e3dc361791ee
This commit is contained in:
MacroFake 2022-07-19 13:29:03 +02:00
commit 948f5ba636
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/fuzz/txorphan.cpp
View File

@ -113,7 +113,7 @@ FUZZ_TARGET_INIT(txorphan, initialize_orphanage)
LOCK(g_cs_orphans);
bool add_tx = orphanage.AddTx(tx, peer_id);
// if have_tx is still false, it must be too big
Assert(!have_tx == GetTransactionWeight(*tx) > MAX_STANDARD_TX_WEIGHT);
Assert(!have_tx == (GetTransactionWeight(*tx) > MAX_STANDARD_TX_WEIGHT));
Assert(!have_tx || !add_tx);
}
},