Merge #21293: test: Replace accidentally placed bit-OR with logical-OR

laanwj · laanwj · commit 9307c588d0be · 2021-02-24T13:19:56.000+01:00
df8f2a1 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 bitcoin/bitcoin@df8f2a1 Tree-SHA512: 36aba3e952850deafe78dd39775a568e89e867c8a352f511f152bce7062f614f5bb4f23266dbb33da5292c9ee6da5ccefce117e3168621c71d2140c8e7f58460
diff --git 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(","));

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static std::map<std::string, unsigned int> mapFlagNames = {`
`63`	`63`
`64`	`64`	`unsigned int ParseScriptFlags(std::string strFlags)`
`65`	`65`	`{`
`66`		`- if (strFlags.empty() \| strFlags == "NONE") return 0;`
	`66`	`+ if (strFlags.empty() \|\| strFlags == "NONE") return 0;`
`67`	`67`	`unsigned int flags = 0;`
`68`	`68`	`std::vector<std::string> words;`
`69`	`69`	`boost::algorithm::split(words, strFlags, boost::algorithm::is_any_of(","));`