[Cmake-commits] CMake branch, next, updated. v2.8.9-519-gacb7f7e

[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  acb7f7e6b07fb5243daf50fef837cb171f906e80 (commit)
       via  1a94c58e2d1ba7445f1801d79b02890d5fc09136 (commit)
      from  de14627fe38d3ed1e8085c9cc24972ae40dfd80f (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=acb7f7e6b07fb5243daf50fef837cb171f906e80
commit acb7f7e6b07fb5243daf50fef837cb171f906e80
Merge: de14627 1a94c58
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Sep 13 12:46:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 13 12:46:23 2012 -0400

    Merge topic 'document-MSVC-variables-12567' into next
    
    1a94c58 MSVCnn documentation: fix compiler warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a94c58e2d1ba7445f1801d79b02890d5fc09136
commit 1a94c58e2d1ba7445f1801d79b02890d5fc09136
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Sep 13 18:39:25 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Sep 13 18:39:25 2012 +0200

    MSVCnn documentation: fix compiler warning

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index 45f36a0..1a23e7b 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -995,17 +995,18 @@ 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);
     cmStdString varName = "MSVC";
     cmsys_ios::ostringstream majorStr;
+
     majorStr << (msvc_versions[i] / 10);
     varName += majorStr.str();
     if (msvc_versions[i] < 100)
       {
-      varName += ('0' + msvc_versions[i] % 10);
+      varName += minor;
       }
 
-    cmStdString verString = majorStr.str() + ".";
-    verString += ('0' + msvc_versions[i] % 10);
+    cmStdString verString = majorStr.str() + "." + minor;
 
     cmStdString shortStr = "True when using Microsoft Visual C " + verString;
     cmStdString fullStr = "Set to true when the compiler is version " +

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

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


hooks/post-receive
-- 
CMake