potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #781 from daniel347x/patch-1

Browse Source 
Change constants used in 'ToBool' to support MSVC
This commit is contained in:
Lee Thomason
2020-03-01 16:53:40 -08:00
committed by GitHub
parent 59b01033f3 d7455034ea
commit 655b15c078
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyxml2.cpp
View File

@@ -617,17 +617,17 @@ bool XMLUtil::ToBool( const char* str, bool* value )
*value = (ival==0) ? false : true; *value = (ival==0) ? false : true;
return true; return true;
} }
static const char* TRUE[] = { "true", "True", "TRUE", 0 }; static const char* TRUE_VALS[] = { "true", "True", "TRUE", 0 };
static const char* FALSE[] = { "false", "False", "FALSE", 0 }; static const char* FALSE_VALS[] = { "false", "False", "FALSE", 0 };
for (int i = 0; TRUE[i]; ++i) { for (int i = 0; TRUE_VALS[i]; ++i) {
if (StringEqual(str, TRUE[i])) { if (StringEqual(str, TRUE_VALS[i])) {
*value = true; *value = true;
return true; return true;
} }
} }
for (int i = 0; FALSE[i]; ++i) { for (int i = 0; FALSE_VALS[i]; ++i) {
if (StringEqual(str, FALSE[i])) { if (StringEqual(str, FALSE_VALS[i])) {
*value = false; *value = false;
return true; return true;
} }