[Cmake-commits] [cmake-commits] king committed cmXMLParser.cxx 1.10 1.11

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13750/Source

Modified Files:
	cmXMLParser.cxx 
Log Message:
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.


Index: cmXMLParser.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmXMLParser.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmXMLParser.cxx	24 Feb 2009 20:43:49 -0000	1.10
--- cmXMLParser.cxx	11 Jun 2009 13:03:56 -0000	1.11
***************
*** 229,233 ****
  void cmXMLParser::ReportXmlParseError()
  {
!   XML_Parser* parser = static_cast<XML_Parser*>(this->Parser);
    this->ReportError(XML_GetCurrentLineNumber(parser),
                      XML_GetCurrentColumnNumber(parser),
--- 229,233 ----
  void cmXMLParser::ReportXmlParseError()
  {
!   XML_Parser parser = static_cast<XML_Parser>(this->Parser);
    this->ReportError(XML_GetCurrentLineNumber(parser),
                      XML_GetCurrentColumnNumber(parser),