This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 5914c8133421a27f07e6c3d8a1112318cd163df3 (commit)
via 8603791553965de4d80a42347022dec1fbd8cd98 (commit)
via 5d1d995bb7a982b13d691f7a926e497f4c44d6f1 (commit)
from 99052a9ddb3e60dd978a722229a17a0b4651219f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5914c8133421a27f07e6c3d8a1112318cd163df3
commit 5914c8133421a27f07e6c3d8a1112318cd163df3
Merge: 99052a9 8603791
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Thu Mar 26 11:57:23 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 26 11:57:23 2015 -0400
Merge topic 'wix-external-expat' into next
86037915 CPackWIX: Add static_casts for XML_Parser.
5d1d995b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8603791553965de4d80a42347022dec1fbd8cd98
commit 8603791553965de4d80a42347022dec1fbd8cd98
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Thu Mar 26 16:56:44 2015 +0100
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Thu Mar 26 16:56:44 2015 +0100
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.
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());
}
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/WiX/cmWIXPatchParser.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
