From 8603791553965de4d80a42347022dec1fbd8cd98 Mon Sep 17 00:00:00 2001 From: Nils Gladitz Date: Thu, 26 Mar 2015 16:56:44 +0100 Subject: [PATCH] CPackWIX: Add static_casts for XML_Parser. "XML_Parser" in cmexpat is a typedef for void* while newer releases of expat seem to use struct XML_ParserStruct *XML_Parser. Add static_casts so that the build works with either variant. --- Source/CPack/WiX/cmWIXPatchParser.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx index ef67b23ec..e066c280f 100644 --- a/Source/CPack/WiX/cmWIXPatchParser.cxx +++ b/Source/CPack/WiX/cmWIXPatchParser.cxx @@ -132,8 +132,8 @@ void cmWIXPatchParser::ReportError(int line, int column, const char* msg) void cmWIXPatchParser::ReportValidationError(std::string const& message) { - ReportError(XML_GetCurrentLineNumber(Parser), - XML_GetCurrentColumnNumber(Parser), + ReportError(XML_GetCurrentLineNumber(static_cast(this->Parser)), + XML_GetCurrentColumnNumber(static_cast(this->Parser)), message.c_str()); }