potok/tinyxml2
1
0
Fork 0
mirror of https://github.com/leethomason/tinyxml2.git synced 2026-07-30 23:52:59 +04:00
Code Packages Releases Wiki Activity

fix compilation warnings produced by -Wold-style-cast

Browse Source
This commit is contained in:
Lurend
2025-06-22 19:08:28 +03:00
committed by Christoph Grüninger
parent 36ff404c34
commit e186491558
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmltest.cpp
+17 -17
View File
@@ -324,9 +324,9 @@ int main( int argc, const char ** argv )
printf( "Test file '%s' loaded. ErrorID=%d\n", argv[1], errorID ); printf( "Test file '%s' loaded. ErrorID=%d\n", argv[1], errorID );
if ( !errorID ) { if ( !errorID ) {
printf( "Load time=%u\n", (unsigned)(loadTime - startTime) ); printf( "Load time=%u\n", static_cast<unsigned>(loadTime - startTime) );
printf( "Delete time=%u\n", (unsigned)(deleteTime - loadTime) ); printf( "Delete time=%u\n", static_cast<unsigned>(deleteTime - loadTime) );
printf( "Total time=%u\n", (unsigned)(deleteTime - startTime) ); printf( "Total time=%u\n", static_cast<unsigned>(deleteTime - startTime) );
} }
exit(0); exit(0);
} }
@@ -595,8 +595,8 @@ int main( int argc, const char ** argv )
result = ele->QueryDoubleAttribute( "attr0", &dVal ); result = ele->QueryDoubleAttribute( "attr0", &dVal );
XMLTest( "Query attribute: int as double", XML_SUCCESS, result); XMLTest( "Query attribute: int as double", XML_SUCCESS, result);
XMLTest( "Query attribute: int as double", 1, (int)dVal ); XMLTest( "Query attribute: int as double", 1, static_cast<int>(dVal) );
XMLTest( "Query attribute: int as double", 1, (int)ele->DoubleAttribute("attr0")); XMLTest( "Query attribute: int as double", 1, static_cast<int>(ele->DoubleAttribute("attr0")));
result = ele->QueryDoubleAttribute( "attr1", &dVal ); result = ele->QueryDoubleAttribute( "attr1", &dVal );
XMLTest( "Query attribute: double as double", XML_SUCCESS, result); XMLTest( "Query attribute: double as double", XML_SUCCESS, result);
@@ -648,17 +648,17 @@ int main( int argc, const char ** argv )
{ {
XMLError 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", static_cast<int>(XML_SUCCESS), queryResult);
} }
{ {
XMLError 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", static_cast<int>(XML_SUCCESS), queryResult);
} }
XMLTest( "Attribute match test", "strValue", ele->Attribute( "str", "strValue" ) ); XMLTest( "Attribute match test", "strValue", ele->Attribute( "str", "strValue" ) );
XMLTest( "Attribute round trip. c-string.", "strValue", cStr ); XMLTest( "Attribute round trip. c-string.", "strValue", cStr );
XMLTest( "Attribute round trip. int.", 1, iVal ); XMLTest( "Attribute round trip. int.", 1, iVal );
XMLTest( "Attribute round trip. double.", -1, (int)dVal ); XMLTest( "Attribute round trip. double.", -1, static_cast<int>(dVal) );
XMLTest( "Alternate query", true, iVal == iVal2 ); XMLTest( "Alternate query", true, iVal == iVal2 );
XMLTest( "Alternate query", true, dVal == dVal2 ); XMLTest( "Alternate query", true, dVal == dVal2 );
XMLTest( "Alternate query", true, iVal == ele->IntAttribute("int") ); XMLTest( "Alternate query", true, iVal == ele->IntAttribute("int") );
@@ -824,7 +824,7 @@ int main( int argc, const char ** argv )
{ {
int v = 0; int v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: int", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: int", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: int", -100, v, true); XMLTest("Attribute: int", -100, v, true);
} }
XMLTest("Attribute: int", -100, element->IntAttribute("attrib"), true); XMLTest("Attribute: int", -100, element->IntAttribute("attrib"), true);
@@ -840,7 +840,7 @@ int main( int argc, const char ** argv )
{ {
unsigned v = 0; unsigned v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: unsigned", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: unsigned", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: unsigned", unsigned(100), v, true); XMLTest("Attribute: unsigned", unsigned(100), v, true);
} }
{ {
@@ -864,7 +864,7 @@ int main( int argc, const char ** argv )
{ {
int64_t v = 0; int64_t v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: int64_t", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: int64_t", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: int64_t", BIG, v, true); XMLTest("Attribute: int64_t", BIG, v, true);
} }
XMLTest("Attribute: int64_t", BIG, element->Int64Attribute("attrib"), true); XMLTest("Attribute: int64_t", BIG, element->Int64Attribute("attrib"), true);
@@ -880,7 +880,7 @@ int main( int argc, const char ** argv )
{ {
uint64_t v = 0; uint64_t v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: uint64_t", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: uint64_t", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: uint64_t", BIG_POS, v, true); XMLTest("Attribute: uint64_t", BIG_POS, v, true);
} }
XMLTest("Attribute: uint64_t", BIG_POS, element->Unsigned64Attribute("attrib"), true); XMLTest("Attribute: uint64_t", BIG_POS, element->Unsigned64Attribute("attrib"), true);
@@ -896,7 +896,7 @@ int main( int argc, const char ** argv )
{ {
bool v = false; bool v = false;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: bool", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: bool", true, v, true); XMLTest("Attribute: bool", true, v, true);
} }
XMLTest("Attribute: bool", true, element->BoolAttribute("attrib"), true); XMLTest("Attribute: bool", true, element->BoolAttribute("attrib"), true);
@@ -924,7 +924,7 @@ int main( int argc, const char ** argv )
{ {
double v = 0; double v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: bool", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: bool", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: double", 100.0, v, true); XMLTest("Attribute: double", 100.0, v, true);
} }
XMLTest("Attribute: double", 100.0, element->DoubleAttribute("attrib"), true); XMLTest("Attribute: double", 100.0, element->DoubleAttribute("attrib"), true);
@@ -940,7 +940,7 @@ int main( int argc, const char ** argv )
{ {
float v = 0; float v = 0;
XMLError queryResult = element->QueryAttribute("attrib", &v); XMLError queryResult = element->QueryAttribute("attrib", &v);
XMLTest("Attribute: float", (int)XML_SUCCESS, queryResult, true); XMLTest("Attribute: float", static_cast<int>(XML_SUCCESS), queryResult, true);
XMLTest("Attribute: float", 100.0f, v, true); XMLTest("Attribute: float", 100.0f, v, true);
} }
XMLTest("Attribute: float", 100.0f, element->FloatAttribute("attrib"), true); XMLTest("Attribute: float", 100.0f, element->FloatAttribute("attrib"), true);
@@ -2779,9 +2779,9 @@ int main( int argc, const char ** argv )
#endif #endif
#if defined( _MSC_VER ) #if defined( _MSC_VER )
const double duration = 1000.0 * (double)(end - start) / ((double)freq * (double)COUNT); const double duration = 1000.0 * static_cast<double>(end - start) / (static_cast<double>(freq) * static_cast<double>(COUNT));
#else #else
const double duration = (double)(cend - cstart) / (double)COUNT; const double duration = static_cast<double>(cend - cstart) / static_cast<double>(COUNT);
#endif #endif
printf("\nParsing dream.xml (%s): %.3f milli-seconds\n", note, duration); printf("\nParsing dream.xml (%s): %.3f milli-seconds\n", note, duration);
} }