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 df8f2a11dc

Tree-SHA512: 36aba3e952850deafe78dd39775a568e89e867c8a352f511f152bce7062f614f5bb4f23266dbb33da5292c9ee6da5ccefce117e3168621c71d2140c8e7f58460
This commit is contained in:
Wladimir J. van der Laan 2021-02-24 13:14:13 +01:00 committed by Konstantin Akimov
parent 5a77c02188
commit 4ab6aa4598
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524

View File

@ -53,7 +53,7 @@ static std::map<std::string, unsigned int> mapFlagNames = {
unsigned int ParseScriptFlags(std::string strFlags) unsigned int ParseScriptFlags(std::string strFlags)
{ {
if (strFlags.empty() | strFlags == "NONE") return 0; if (strFlags.empty() || strFlags == "NONE") return 0;
unsigned int flags = 0; unsigned int flags = 0;
std::vector<std::string> words = SplitString(strFlags, ','); std::vector<std::string> words = SplitString(strFlags, ',');