[Cmake-commits] CMake branch, next, updated. v2.8.7-2435-g7177838
Eric Noulard
eric.noulard at gmail.com
Wed Feb 1 15:06:25 EST 2012
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 7177838d6b24218bed553764cfbf56886b7736a1 (commit)
via d34e9d19c657754a3edba49f1a7061d773b843c9 (commit)
via 1819332e1f9b39f864e8a58c887c2ac8b4b9bcdd (commit)
via 37f90ed57609308ff33223474567e5bfb94c2a21 (commit)
via 7c82b7f51a7c7a02d060ca804e15049c0a745748 (commit)
from 59d27a2e9d9204ded72d50a009ff2dd7e550182b (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=7177838d6b24218bed553764cfbf56886b7736a1
commit 7177838d6b24218bed553764cfbf56886b7736a1
Merge: 59d27a2 d34e9d1
Author: Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Feb 1 15:06:22 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 15:06:22 2012 -0500
Merge topic 'ImproveCPackDoc-reloaded' into next
d34e9d1 Merge branch 'ImproveCPackDoc-reloaded' of git://cmake.org/stage/cmake into ImproveCPackDoc-reloaded
1819332 Really avoid compiler warning about unused vars
37f90ed Calm down compiler warning about unused var
7c82b7f Fix potential bad memory access, thanks to Eike
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d34e9d19c657754a3edba49f1a7061d773b843c9
commit d34e9d19c657754a3edba49f1a7061d773b843c9
Merge: 1819332 37f90ed
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Feb 1 20:48:11 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Feb 1 20:48:11 2012 +0100
Merge branch 'ImproveCPackDoc-reloaded' of git://cmake.org/stage/cmake into ImproveCPackDoc-reloaded
diff --cc Source/CPack/cmCPackDocumentMacros.cxx
index ddc75a4,94d5391..050305f
--- a/Source/CPack/cmCPackDocumentMacros.cxx
+++ b/Source/CPack/cmCPackDocumentMacros.cxx
@@@ -1,8 -1,10 +1,10 @@@
#include "cmCPackDocumentMacros.h"
void cmCPackDocumentMacros::GetMacrosDocumentation(
- std::vector<cmDocumentationEntry>& v)
+ std::vector<cmDocumentationEntry>& )
{
+ // avoid compiler warning
+ (int)v.size();
// Commented-out example of use
//
// cmDocumentationEntry e("cpack_<macro>",
diff --cc Source/CPack/cmCPackDocumentVariables.cxx
index 6327152,27d4df2..f90982f
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@@ -1,8 -1,10 +1,10 @@@
#include "cmCPackDocumentVariables.h"
#include "cmake.h"
-void cmCPackDocumentVariables::DefineVariables(cmake* cm)
+void cmCPackDocumentVariables::DefineVariables(cmake* )
{
+ // avoid compiler warning
+ (void*)cm;
// Subsection: variables defined/used by cpack,
// which are common to all CPack generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1819332e1f9b39f864e8a58c887c2ac8b4b9bcdd
commit 1819332e1f9b39f864e8a58c887c2ac8b4b9bcdd
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Feb 1 20:47:28 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Feb 1 20:47:28 2012 +0100
Really avoid compiler warning about unused vars
diff --git a/Source/CPack/cmCPackDocumentMacros.cxx b/Source/CPack/cmCPackDocumentMacros.cxx
index 94d5391..ddc75a4 100644
--- a/Source/CPack/cmCPackDocumentMacros.cxx
+++ b/Source/CPack/cmCPackDocumentMacros.cxx
@@ -1,10 +1,8 @@
#include "cmCPackDocumentMacros.h"
void cmCPackDocumentMacros::GetMacrosDocumentation(
- std::vector<cmDocumentationEntry>& v)
+ std::vector<cmDocumentationEntry>& )
{
- // avoid compiler warning
- (int)v.size();
// Commented-out example of use
//
// cmDocumentationEntry e("cpack_<macro>",
diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 27d4df2..6327152 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -1,10 +1,8 @@
#include "cmCPackDocumentVariables.h"
#include "cmake.h"
-void cmCPackDocumentVariables::DefineVariables(cmake* cm)
+void cmCPackDocumentVariables::DefineVariables(cmake* )
{
- // avoid compiler warning
- (void*)cm;
// Subsection: variables defined/used by cpack,
// which are common to all CPack generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37f90ed57609308ff33223474567e5bfb94c2a21
commit 37f90ed57609308ff33223474567e5bfb94c2a21
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 31 21:27:55 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 31 22:45:07 2012 +0100
Calm down compiler warning about unused var
diff --git a/Source/CPack/cmCPackDocumentMacros.cxx b/Source/CPack/cmCPackDocumentMacros.cxx
index 8752e56..94d5391 100644
--- a/Source/CPack/cmCPackDocumentMacros.cxx
+++ b/Source/CPack/cmCPackDocumentMacros.cxx
@@ -3,6 +3,8 @@
void cmCPackDocumentMacros::GetMacrosDocumentation(
std::vector<cmDocumentationEntry>& v)
{
+ // avoid compiler warning
+ (int)v.size();
// Commented-out example of use
//
// cmDocumentationEntry e("cpack_<macro>",
diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 8b60d5f..27d4df2 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -3,6 +3,8 @@
void cmCPackDocumentVariables::DefineVariables(cmake* cm)
{
+ // avoid compiler warning
+ (void*)cm;
// Subsection: variables defined/used by cpack,
// which are common to all CPack generators
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c82b7f51a7c7a02d060ca804e15049c0a745748
commit 7c82b7f51a7c7a02d060ca804e15049c0a745748
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 31 21:26:44 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 31 22:44:58 2012 +0100
Fix potential bad memory access, thanks to Eike
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 8aa4721..80f74a6 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -512,7 +512,7 @@ bool cmDocumentation::CreateSingleModule(const char* fname,
if(line.size() && line[0] == '#')
{
/* line beginnings with ## are mark-up ignore them */
- if (line[1] == '#') continue;
+ if (line.size()>=2 && line[1] == '#') continue;
// blank line
if(line.size() <= 2)
{
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackDocumentMacros.cxx | 2 +-
Source/CPack/cmCPackDocumentVariables.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list