[Cmake-commits] CMake branch, next, updated. v2.8.9-560-g3631f51

[Rolf Eike Beer]

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  3631f51cec4dd13a4bb1787976408768bf955daa (commit)
       via  8d84fd7261a019462562528115217386635fca37 (commit)
      from  b62d0206541b326a5e8a5c5a05134927efbeafc0 (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=3631f51cec4dd13a4bb1787976408768bf955daa
commit 3631f51cec4dd13a4bb1787976408768bf955daa
Merge: b62d020 8d84fd7
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 17 13:48:20 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 17 13:48:20 2012 -0400

    Merge topic 'document-MSVC-variables-12567' into next
    
    8d84fd7 MSVCnn documentation: hopefully final fix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d84fd7261a019462562528115217386635fca37
commit 8d84fd7261a019462562528115217386635fca37
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Sep 17 19:47:37 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Sep 17 19:47:37 2012 +0200

    MSVCnn documentation: hopefully final fix

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 981d576..5e7e081 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1,6 +1,8 @@
 #include "cmDocumentVariables.h"
 #include "cmake.h"
 
+#include <cmsys/ios/sstream>
+
 void cmDocumentVariables::DefineVariables(cmake* cm)
 {
   // Subsection: variables defined by cmake, that give
@@ -995,7 +997,7 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
   int msvc_versions[] = { 60, 70, 71, 80, 90, 100, 110, 0 };
   for (int i = 0; msvc_versions[i] != 0; i ++)
     {
-    const char minor = '0' + (char)(msvc_versions[i] % 10);
+    const char minor = (char)('0' + (msvc_versions[i] % 10));
     cmStdString varName = "MSVC";
     cmsys_ios::ostringstream majorStr;
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmDocumentVariables.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake