[Cmake-commits] CMake branch, next, updated. v2.8.7-2384-g92727b5

Eric Noulard eric.noulard at gmail.com
Tue Jan 31 15:30:14 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  92727b505c2da8faa95fc869fb9d8b5700c88f5a (commit)
       via  cc4ac320ba641fe1e4e589dc6545db2552fc0b2e (commit)
       via  1b31c19eee19a4f4dc691806154ca6a6ecae800a (commit)
      from  4636aa6cf53b91fc13d5f7e038681646a139e730 (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=92727b505c2da8faa95fc869fb9d8b5700c88f5a
commit 92727b505c2da8faa95fc869fb9d8b5700c88f5a
Merge: 4636aa6 cc4ac32
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Jan 31 15:30:01 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 31 15:30:01 2012 -0500

    Merge topic 'ImproveCPackDoc-reloaded' into next
    
    cc4ac32 Calm down compiler warning about unused var
    1b31c19 Fix potential bad memory access, thanks to Rolf


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc4ac320ba641fe1e4e589dc6545db2552fc0b2e
commit cc4ac320ba641fe1e4e589dc6545db2552fc0b2e
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 31 21:27:55 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jan 31 21:27:55 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=1b31c19eee19a4f4dc691806154ca6a6ecae800a
commit 1b31c19eee19a4f4dc691806154ca6a6ecae800a
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jan 31 21:26:44 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jan 31 21:26:44 2012 +0100

    Fix potential bad memory access, thanks to Rolf

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 ++
 Source/cmDocumentation.cxx                |    2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list