diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-27 13:15:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-27 13:15:23 (GMT) |
| commit | a92f217a4bc8eb682b1b6b79076549314caffc1e (patch) | |
| tree | 1ecf96e69c7bcbf4aca81244c38397c3fbf18c27 /Source | |
| parent | 78650361315beb2a75bdae49988064200710556e (diff) | |
| parent | 8603791553965de4d80a42347022dec1fbd8cd98 (diff) | |
| download | CMake-a92f217a4bc8eb682b1b6b79076549314caffc1e.zip CMake-a92f217a4bc8eb682b1b6b79076549314caffc1e.tar.gz CMake-a92f217a4bc8eb682b1b6b79076549314caffc1e.tar.bz2 | |
Merge topic 'wix-external-expat'
86037915 CPackWIX: Add static_casts for XML_Parser.
Diffstat (limited to 'Source')
| -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()); } |