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 7c92f0f6942c5d90a5b742c504649750a6b3dcff (commit)
via 6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379 (commit)
from 8429b7f97bfb1967943737145b72b6de5da1282f (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=7c92f0f6942c5d90a5b742c504649750a6b3dcff
commit 7c92f0f6942c5d90a5b742c504649750a6b3dcff
Merge: 8429b7f 6cce3d6
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Sat Jan 4 12:42:45 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Jan 4 12:42:45 2014 -0500
Merge topic 'unicode-main' into next
6cce3d6 Fix compile errors and warnings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379
commit 6cce3d62eba40fdf3a5e5c0b89a2a66cbc3d5379
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Sat Jan 4 10:42:03 2014 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Sat Jan 4 10:42:03 2014 -0700
Fix compile errors and warnings.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index b046f95..a19b778 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -98,7 +98,7 @@ int cpackDefinitionArgument(const char* argument, const char*
cValue,
//----------------------------------------------------------------------------
// this is CPack.
-int main (int argc, char const* const argv[])
+int main (int argc, char const* const* argv)
{
cmsys::Encoding::CommandLineArguments args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 08c9673..821121e 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -49,10 +49,10 @@ static const char * cmDocumentationOptions[][2] =
int main(int argc, char** argv)
{
- cmsys::Encoding::CommandLineArguments args =
+ cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
- int argc2 = args.argc();
- char const* const* argv2 = args.argv();
+ int argc2 = encoding_args.argc();
+ char const* const* argv2 = encoding_args.argv();
cmSystemTools::FindCMakeResources(argv2[0]);
// check docs first so that X is not need to get docs
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 53900f1..3eb5551 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -112,7 +112,7 @@ static const char * cmDocumentationOptions[][2] =
};
// this is a test driver program for cmCTest.
-int main (int argc, char const* const argv[])
+int main (int argc, char const* const* argv)
{
cmsys::Encoding::CommandLineArguments encoding_args =
cmsys::Encoding::CommandLineArguments::Main(argc, argv);
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cpack.cxx | 2 +-
Source/QtDialog/CMakeSetup.cxx | 6 +++---
Source/ctest.cxx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
