From b5e767a6b946fea27196ac3c20136e2e1f270d33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Sat, 26 Jul 2025 23:08:21 +0200 Subject: [PATCH] Fix more warnings for C-style casts Use static_cast or reinterpret_cast. Found by g++ 15. --- xmltest.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xmltest.cpp b/xmltest.cpp index 184531f..8a654e4 100644 --- a/xmltest.cpp +++ b/xmltest.cpp @@ -675,7 +675,7 @@ int main( int argc, const char ** argv ) const unsigned char correctValue[] = { 0xd1U, 0x86U, 0xd0U, 0xb5U, 0xd0U, 0xbdU, 0xd0U, 0xbdU, 0xd0U, 0xbeU, 0xd1U, 0x81U, 0xd1U, 0x82U, 0xd1U, 0x8cU, 0 }; - XMLTest( "UTF-8: Russian value.", (const char*)correctValue, element->Attribute( "value" ) ); + XMLTest( "UTF-8: Russian value.", reinterpret_cast(correctValue), element->Attribute( "value" ) ); const unsigned char russianElementName[] = { 0xd0U, 0xa0U, 0xd1U, 0x83U, 0xd1U, 0x81U, 0xd1U, 0x81U, @@ -683,7 +683,7 @@ int main( int argc, const char ** argv ) 0xd0U, 0xb9U, 0 }; const char russianText[] = "<\xD0\xB8\xD0\xBC\xD0\xB5\xD0\xB5\xD1\x82>"; - XMLText* text = doc.FirstChildElement( "document" )->FirstChildElement( (const char*) russianElementName )->FirstChild()->ToText(); + XMLText* text = doc.FirstChildElement( "document" )->FirstChildElement( reinterpret_cast(russianElementName) )->FirstChild()->ToText(); XMLTest( "UTF-8: Browsing russian element name.", russianText, text->Value() ); @@ -1068,15 +1068,15 @@ int main( int argc, const char ** argv ) unsigned unsigned_value; unsigned_value = root->FirstChildElement("unsigned")->UnsignedText(); - XMLTest("PushText( unsigned value ) test", (unsigned)12, unsigned_value); + XMLTest("PushText( unsigned value ) test", static_cast(12), unsigned_value); int64_t int64_t_value; int64_t_value = root->FirstChildElement("int64_t")->Int64Text(); - XMLTest("PushText( int64_t value ) test", (int64_t) 13, int64_t_value); + XMLTest("PushText( int64_t value ) test", static_cast(13), int64_t_value); uint64_t uint64_t_value; uint64_t_value = root->FirstChildElement("uint64_t")->Unsigned64Text(); - XMLTest("PushText( uint64_t value ) test", (uint64_t) 14, uint64_t_value); + XMLTest("PushText( uint64_t value ) test", static_cast(14), uint64_t_value); float float_value; float_value = root->FirstChildElement("float")->FloatText(); @@ -1397,7 +1397,7 @@ int main( int argc, const char ** argv ) buf[61] = 0; XMLDocument doc; - doc.Parse( (const char*)buf); + doc.Parse( reinterpret_cast(buf) ); XMLTest( "Broken CDATA", true, doc.Error() ); } @@ -1753,7 +1753,7 @@ int main( int argc, const char ** argv ) unsigned unsignedValue = 0; XMLError queryResult = pointElement->FirstChildElement( "y" )->QueryUnsignedText( &unsignedValue ); XMLTest( "QueryUnsignedText result", XML_SUCCESS, queryResult, false ); - XMLTest( "QueryUnsignedText", (unsigned)1, unsignedValue, false ); + XMLTest( "QueryUnsignedText", static_cast(1), unsignedValue, false ); } {