[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1080-g1026cf2

[Brad King]

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  1026cf2f724b1ad7cc712de53e14ab636318b07d (commit)
       via  aa335eefba95781030075162542ac64290c25164 (commit)
      from  49d1822f8fa294512c74dc1b3d9ffceef23bef46 (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=1026cf2f724b1ad7cc712de53e14ab636318b07d
commit 1026cf2f724b1ad7cc712de53e14ab636318b07d
Merge: 49d1822 aa335ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 08:31:03 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 27 08:31:03 2012 -0500

    Merge topic 'windows-ce' into next
    
    aa335ee VS: Fix WCEPlatformParser local shadowing parameter


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa335eefba95781030075162542ac64290c25164
commit aa335eefba95781030075162542ac64290c25164
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 27 08:30:14 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 27 08:30:14 2012 -0500

    VS: Fix WCEPlatformParser local shadowing parameter

diff --git a/Source/cmVisualStudioWCEPlatformParser.cxx b/Source/cmVisualStudioWCEPlatformParser.cxx
index 270ee0c..0afcf67 100644
--- a/Source/cmVisualStudioWCEPlatformParser.cxx
+++ b/Source/cmVisualStudioWCEPlatformParser.cxx
@@ -73,24 +73,24 @@ void cmVisualStudioWCEPlatformParser::StartElement(const char* name,
 
   if(strcmp(name, "Macro") == 0)
     {
-    std::string name;
-    std::string value;
+    std::string macroName;
+    std::string macroValue;
 
     for(const char** attr = attributes; *attr; attr += 2)
       {
       if(strcmp(attr[0], "Name") == 0)
         {
-        name = attr[1];
+        macroName = attr[1];
         }
       else if(strcmp(attr[0], "Value") == 0)
         {
-        value = attr[1];
+        macroValue = attr[1];
         }
       }
 
-    if(!name.empty())
+    if(!macroName.empty())
       {
-      this->Macros[name] = value;
+      this->Macros[macroName] = macroValue;
       }
     }
 }

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

Summary of changes:
 Source/cmVisualStudioWCEPlatformParser.cxx |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake