]> git.saurik.com Git - wxWidgets.git/commitdiff
Fixed XML parser error text formatting.
authorVáclav Slavík <vslavik@fastmail.fm>
Sat, 3 Jul 2010 14:24:31 +0000 (14:24 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sat, 3 Jul 2010 14:24:31 +0000 (14:24 +0000)
XML_GetCurrentLineNumber() returns int in some versions of Expat and
unsigned long (or even uint64_t) in other versions. Just cast the value
to int so that it works correctly with all versions.

Fixes #12196.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/xml/xml.cpp

index 534777558a3aeb965e35df5389352c7ec040d923..6c3a9e5d40c13b683aa0d48c2e5f87ff9d25fd76 100644 (file)
@@ -744,7 +744,7 @@ bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int fl
                            *wxConvCurrent);
             wxLogError(_("XML parsing error: '%s' at line %d"),
                        error.c_str(),
                            *wxConvCurrent);
             wxLogError(_("XML parsing error: '%s' at line %d"),
                        error.c_str(),
-                       XML_GetCurrentLineNumber(parser));
+                       (int)XML_GetCurrentLineNumber(parser));
             ok = false;
             break;
         }
             ok = false;
             break;
         }