diff options
| author | Brad King <brad.king@kitware.com> | 2009-06-11 13:03:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-06-11 13:03:56 (GMT) |
| commit | f0ab852000b5c1ea17509c6e57e61942ba878984 (patch) | |
| tree | 669cde51c42fb971316877f69bdc95a38bb1990c /Source/cmXMLParser.cxx | |
| parent | 60bfa0ad3f7f22f7e8054af01d4b87f319e56add (diff) | |
| download | CMake-f0ab852000b5c1ea17509c6e57e61942ba878984.zip CMake-f0ab852000b5c1ea17509c6e57e61942ba878984.tar.gz CMake-f0ab852000b5c1ea17509c6e57e61942ba878984.tar.bz2 | |
COMP: Fix build with system-installed expat 2.0.1
In cmXMLParser::ReportXmlParseError we were accidentally passing a value
of type 'XML_Parser*' to expat methods instead of 'XML_Parser'. It was
not caught because XML_Parser was just 'void*' in the cmexpat version.
Newer system-installed expat versions catch the error because XML_Parser
is now a pointer to a real type. This correct the type.
Diffstat (limited to 'Source/cmXMLParser.cxx')
| -rw-r--r-- | Source/cmXMLParser.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx index 0f68cb6..db9a27c 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -228,7 +228,7 @@ void cmXMLParserCharacterDataHandler(void* parser, const char* data, //---------------------------------------------------------------------------- void cmXMLParser::ReportXmlParseError() { - XML_Parser* parser = static_cast<XML_Parser*>(this->Parser); + XML_Parser parser = static_cast<XML_Parser>(this->Parser); this->ReportError(XML_GetCurrentLineNumber(parser), XML_GetCurrentColumnNumber(parser), XML_ErrorString(XML_GetErrorCode(parser))); |