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

Merge pull request #859 from cugone/FixWrongQueryAssignment

Browse Source 
Fixes Query results in xmltest being assigned to int instead of XMLError
This commit is contained in:
Lee Thomason
2021-05-10 19:54:20 -07:00
committed by GitHub
parent 6376b3fbc7 5e76573894
commit f2db58e658
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xmltest.cpp
View File

@@ -647,11 +647,11 @@ int main( int argc, const char ** argv )
} }
{ {
int queryResult = ele->QueryAttribute( "int", &iVal2 ); XMLError queryResult = ele->QueryAttribute( "int", &iVal2 );
XMLTest( "Query int attribute generic", (int)XML_SUCCESS, queryResult); XMLTest( "Query int attribute generic", (int)XML_SUCCESS, queryResult);
} }
{ {
int queryResult = ele->QueryAttribute( "double", &dVal2 ); XMLError queryResult = ele->QueryAttribute( "double", &dVal2 );
XMLTest( "Query double attribute generic", (int)XML_SUCCESS, queryResult); XMLTest( "Query double attribute generic", (int)XML_SUCCESS, queryResult);
} }
@@ -823,7 +823,7 @@ int main( int argc, const char ** argv )
} }
{ {
int v = 0; int v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: int", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: int", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: int", -100, v, true); XMLTest("Attribute: int", -100, v, true);
} }
@@ -839,7 +839,7 @@ int main( int argc, const char ** argv )
} }
{ {
unsigned v = 0; unsigned v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: unsigned", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: unsigned", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: unsigned", unsigned(100), v, true); XMLTest("Attribute: unsigned", unsigned(100), v, true);
} }
@@ -863,7 +863,7 @@ int main( int argc, const char ** argv )
} }
{ {
int64_t v = 0; int64_t v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: int64_t", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: int64_t", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: int64_t", BIG, v, true); XMLTest("Attribute: int64_t", BIG, v, true);
} }
@@ -879,7 +879,7 @@ int main( int argc, const char ** argv )
} }
{ {
uint64_t v = 0; uint64_t v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: uint64_t", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: uint64_t", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: uint64_t", BIG_POS, v, true); XMLTest("Attribute: uint64_t", BIG_POS, v, true);
} }
@@ -895,7 +895,7 @@ int main( int argc, const char ** argv )
} }
{ {
bool v = false; bool v = false;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: bool", true, v, true); XMLTest("Attribute: bool", true, v, true);
} }
@@ -923,7 +923,7 @@ int main( int argc, const char ** argv )
} }
{ {
double v = 0; double v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: double", 100.0, v, true); XMLTest("Attribute: double", 100.0, v, true);
} }
@@ -939,7 +939,7 @@ int main( int argc, const char ** argv )
} }
{ {
float v = 0; float v = 0;
int queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: float", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: float", (int)XML_SUCCESS, queryResult, true);
XMLTest("Attribute: float", 100.0f, v, true); XMLTest("Attribute: float", 100.0f, v, true);
} }