[Cmake-commits] CMake branch, next, updated. v2.8.9-512-g4e2baa8

[Stephen Kelly]

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  4e2baa83cff83c51e589596d8cbb76179ed55d03 (commit)
       via  92c52e55fc837177f610f8bcf6fdfb32d432f6e5 (commit)
      from  58a78b529b43e587e2bd151ed5642d55b1e8a073 (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=4e2baa83cff83c51e589596d8cbb76179ed55d03
commit 4e2baa83cff83c51e589596d8cbb76179ed55d03
Merge: 58a78b5 92c52e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 13 07:47:16 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 13 07:47:16 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    92c52e5 Use 'unsigned int' instead of uint.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92c52e55fc837177f610f8bcf6fdfb32d432f6e5
commit 92c52e55fc837177f610f8bcf6fdfb32d432f6e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 13 13:45:27 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Sep 13 13:45:27 2012 +0200

    Use 'unsigned int' instead of uint.
    
    Dashboards are failing due to MSVC presumably not having a built-in
    for that.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 22a5b52..0d1e1db 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -324,7 +324,7 @@ cmGeneratorExpressionNode* const GetNode(const std::string &identifier)
 //----------------------------------------------------------------------------
 GeneratorExpressionContent::GeneratorExpressionContent(
                                                     const char *startContent,
-                                                    uint length)
+                                                    unsigned int length)
   : StartContent(startContent), ContentLength(length)
 {
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 1c10e07..bf35778 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -46,7 +46,7 @@ struct cmGeneratorExpressionEvaluator
 
 struct TextContent : public cmGeneratorExpressionEvaluator
 {
-  TextContent(const char *start, uint length)
+  TextContent(const char *start, unsigned int length)
     : Content(start), Length(length)
   {
 
@@ -62,25 +62,25 @@ struct TextContent : public cmGeneratorExpressionEvaluator
     return cmGeneratorExpressionEvaluator::Text;
   }
 
-  void Extend(uint length)
+  void Extend(unsigned int length)
   {
     this->Length += length;
   }
 
-  uint GetLength()
+  unsigned int GetLength()
   {
     return this->Length;
   }
 
 private:
   const char *Content;
-  uint Length;
+  unsigned int Length;
 };
 
 //----------------------------------------------------------------------------
 struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator
 {
-  GeneratorExpressionContent(const char *startContent, uint length);
+  GeneratorExpressionContent(const char *startContent, unsigned int length);
   void SetIdentifier(std::vector<cmGeneratorExpressionEvaluator*> identifier)
   {
     this->IdentifierChildren = identifier;
@@ -105,7 +105,7 @@ private:
   std::vector<cmGeneratorExpressionEvaluator*> IdentifierChildren;
   std::vector<std::vector<cmGeneratorExpressionEvaluator*> > ParamChildren;
   const char *StartContent;
-  uint ContentLength;
+  unsigned int ContentLength;
 };
 
 #endif
diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx
index 7e6c51e..2a5cc7a 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -75,7 +75,7 @@ static void extendResult(std::vector<cmGeneratorExpressionEvaluator*> &result,
 void cmGeneratorExpressionParser::ParseGeneratorExpression(
                         std::vector<cmGeneratorExpressionEvaluator*> &result)
 {
-  uint nestedLevel = this->NestingLevel;
+  unsigned int nestedLevel = this->NestingLevel;
   ++this->NestingLevel;
 
   std::vector<cmGeneratorExpressionToken>::const_iterator startToken
diff --git a/Source/cmGeneratorExpressionParser.h b/Source/cmGeneratorExpressionParser.h
index 7cb1487..8bdb1a4 100644
--- a/Source/cmGeneratorExpressionParser.h
+++ b/Source/cmGeneratorExpressionParser.h
@@ -39,7 +39,7 @@ private:
 private:
   std::vector<cmGeneratorExpressionToken>::const_iterator it;
   const std::vector<cmGeneratorExpressionToken> Tokens;
-  uint NestingLevel;
+  unsigned int NestingLevel;
 };
 
 #endif

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |    2 +-
 Source/cmGeneratorExpressionEvaluator.h   |   12 ++++++------
 Source/cmGeneratorExpressionParser.cxx    |    2 +-
 Source/cmGeneratorExpressionParser.h      |    2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake