TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1800 from Azaezel/andOrMaybe

Browse source 
clang reports: unclear || + && and &+| mixes.
This commit is contained in:
Anis 2017-01-07 02:31:05 +01:00 • committed by GitHub
commit 55b7a8431c
16 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/core/strings/unicode.cpp
View file

@ -481,7 +481,7 @@ U32 oneUTF32toUTF8(const UTF32 codepoint, UTF8 *threeByteCodeunitBuf)
// Process the 1st byte. filter based on the # of expected bytes.
mask = sgByteMask8LUT[bytecount];
marker = ( ~mask << 1 );
threeByteCodeunitBuf[0] = marker | working & mask;
threeByteCodeunitBuf[0] = marker | (working & mask);
PROFILE_END();
return bytecount;

2
Engine/source/core/tagDictionary.cpp
View file

@ -290,7 +290,7 @@ bool TagDictionary::match(const char* pattern, const char* str)
return !*str;
case '*':
return match(pattern+1, str) || *str && match(pattern, str+1);
return match(pattern+1, str) || (*str && match(pattern, str+1));
case '?':
return *str && match(pattern+1, str+1);