[Cmake-commits] CMake branch, next, updated. v2.8.12-4236-g06db188

[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  06db1883b8631f8b5ce86ab75249ca146dcfde07 (commit)
       via  a80fe4b1d24dff993442a45e63948eeb9e6a3962 (commit)
      from  0acb875e9f10337ca0cf2b5186b8f87e07094b64 (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=06db1883b8631f8b5ce86ab75249ca146dcfde07
commit 06db1883b8631f8b5ce86ab75249ca146dcfde07
Merge: 0acb875 a80fe4b
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 21 14:45:58 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 21 14:45:58 2013 -0400

    Merge topic 'genex-conversion-warnings' into next
    
    a80fe4b use size_t for GeneratorExpressionContent::ContentLength to fix some warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a80fe4b1d24dff993442a45e63948eeb9e6a3962
commit a80fe4b1d24dff993442a45e63948eeb9e6a3962
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 21 19:18:16 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 21 19:58:49 2013 +0200

    use size_t for GeneratorExpressionContent::ContentLength to fix some warnings
    
    CMake/Source/cmGeneratorExpressionParser.cxx: In member function ‘void cmGeneratorExpressionParser::ParseGeneratorExpression(std::vector<cmGeneratorExpressionEvaluator*>&)’:
    CMake/Source/cmGeneratorExpressionParser.cxx:116:55: warning: conversion to ‘unsigned int’ from ‘long int’ may alter its value [-Wconversion]
    CMake/Source/cmGeneratorExpressionParser.cxx:240:39: warning: conversion to ‘int’ from ‘long int’ may alter its value [-Wconversion]

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 7fd0fdc..dfd995e 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1446,7 +1446,7 @@ cmGeneratorExpressionNode* GetNode(const std::string &identifier)
 //----------------------------------------------------------------------------
 GeneratorExpressionContent::GeneratorExpressionContent(
                                                     const char *startContent,
-                                                    unsigned int length)
+                                                    size_t length)
   : StartContent(startContent), ContentLength(length)
 {
 
diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h
index 218abf1..343e18b 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -63,7 +63,7 @@ private:
 
 struct TextContent : public cmGeneratorExpressionEvaluator
 {
-  TextContent(const char *start, unsigned int length)
+  TextContent(const char *start, size_t length)
     : Content(start), Length(length)
   {
 
@@ -80,25 +80,25 @@ struct TextContent : public cmGeneratorExpressionEvaluator
     return cmGeneratorExpressionEvaluator::Text;
   }
 
-  void Extend(unsigned int length)
+  void Extend(size_t length)
   {
     this->Length += length;
   }
 
-  unsigned int GetLength()
+  size_t GetLength()
   {
     return this->Length;
   }
 
 private:
   const char *Content;
-  unsigned int Length;
+  size_t Length;
 };
 
 //----------------------------------------------------------------------------
 struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator
 {
-  GeneratorExpressionContent(const char *startContent, unsigned int length);
+  GeneratorExpressionContent(const char *startContent, size_t length);
   void SetIdentifier(std::vector<cmGeneratorExpressionEvaluator*> identifier)
   {
     this->IdentifierChildren = identifier;
@@ -141,7 +141,7 @@ private:
   std::vector<cmGeneratorExpressionEvaluator*> IdentifierChildren;
   std::vector<std::vector<cmGeneratorExpressionEvaluator*> > ParamChildren;
   const char *StartContent;
-  unsigned int ContentLength;
+  size_t ContentLength;
 };
 
 #endif
diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h
index 5f16712..83d661d 100644
--- a/Source/cmGeneratorExpressionLexer.h
+++ b/Source/cmGeneratorExpressionLexer.h
@@ -19,7 +19,7 @@
 //----------------------------------------------------------------------------
 struct cmGeneratorExpressionToken
 {
-  cmGeneratorExpressionToken(unsigned type, const char *c, unsigned l)
+  cmGeneratorExpressionToken(unsigned type, const char *c, size_t l)
     : TokenType(type), Content(c), Length(l)
   {
   }
@@ -32,7 +32,7 @@ struct cmGeneratorExpressionToken
   };
   unsigned TokenType;
   const char *Content;
-  unsigned Length;
+  size_t Length;
 };
 
 /** \class cmGeneratorExpressionLexer
diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx
index e1fb8f1..a41a6e5 100644
--- a/Source/cmGeneratorExpressionParser.cxx
+++ b/Source/cmGeneratorExpressionParser.cxx
@@ -235,7 +235,7 @@ void cmGeneratorExpressionParser::ParseGeneratorExpression(
     return;
   }
 
-  int contentLength = ((this->it - 1)->Content
+  size_t contentLength = ((this->it - 1)->Content
                     - startToken->Content)
                     + (this->it - 1)->Length;
   GeneratorExpressionContent *content = new GeneratorExpressionContent(

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

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


hooks/post-receive
-- 
CMake