diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-26 15:56:44 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2015-03-26 15:56:44 (GMT) |
| commit | 8603791553965de4d80a42347022dec1fbd8cd98 (patch) | |
| tree | 04c60ba65297025a08677cf1d4c446127cf26a6f | |
| parent | 5d1d995bb7a982b13d691f7a926e497f4c44d6f1 (diff) | |
| download | CMake-8603791553965de4d80a42347022dec1fbd8cd98.zip CMake-8603791553965de4d80a42347022dec1fbd8cd98.tar.gz CMake-8603791553965de4d80a42347022dec1fbd8cd98.tar.bz2 | |
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.
| -rw-r--r-- | Source/CPack/WiX/cmWIXPatchParser.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/WiX/cmWIXPatchParser.cxx b/Source/CPack/WiX/cmWIXPatchParser.cxx index ef67b23..e066c28 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<XML_Parser>(this->Parser)), + XML_GetCurrentColumnNumber(static_cast<XML_Parser>(this->Parser)), message.c_str()); } |