diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-24 13:14:13 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-02-24 13:19:56 +0100 |
| commit | 9307c588d0bedda484487af89f215109d150a598 (patch) | |
| tree | 70377eefab16b37aaafd346a455c607f092ee210 | |
| parent | b59f2787e53318caad6d3292de2cc6e17995d277 (diff) | |
| parent | df8f2a11dcadd08840c5311631132a522650a83e (diff) | |
| download | bitcoin-9307c588d0bedda484487af89f215109d150a598.tar.xz | |
Merge #21293: test: Replace accidentally placed bit-OR with logical-OR
df8f2a11dcadd08840c5311631132a522650a83e test: Replace accidentally placed bit-OR with logical-OR (Hennadii Stepanov)
Pull request description:
This PR is a follow up of #19698.
ACKs for top commit:
glozow:
utACK https://github.com/bitcoin/bitcoin/pull/21293/commits/df8f2a11dcadd08840c5311631132a522650a83e
Tree-SHA512: 36aba3e952850deafe78dd39775a568e89e867c8a352f511f152bce7062f614f5bb4f23266dbb33da5292c9ee6da5ccefce117e3168621c71d2140c8e7f58460
| -rw-r--r-- | src/test/transaction_tests.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index d1770f750f..8f1d99b199 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -63,7 +63,7 @@ static std::map<std::string, unsigned int> mapFlagNames = { unsigned int ParseScriptFlags(std::string strFlags) { - if (strFlags.empty() | strFlags == "NONE") return 0; + if (strFlags.empty() || strFlags == "NONE") return 0; unsigned int flags = 0; std::vector<std::string> words; boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(",")); |