[Cmake-commits] CMake branch, next, updated. v2.8.9-523-g686877c

[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  686877c88db9593edc9466f38b68a839953401e2 (commit)
       via  891f70787e4b12ffb49e6c73e2b4608a6d51046d (commit)
      from  00d7a294b1ede57c31ee5f71ccdae7fd7d4d6cb7 (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=686877c88db9593edc9466f38b68a839953401e2
commit 686877c88db9593edc9466f38b68a839953401e2
Merge: 00d7a29 891f707
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Sep 13 14:54:53 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 13 14:54:53 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    891f707 Fix build after last commit.


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

    Fix build after last commit.

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 4a58590..e1f3166 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -103,7 +103,7 @@ const char *cmCompiledGeneratorExpression::Evaluate(
 
 cmCompiledGeneratorExpression::cmCompiledGeneratorExpression(
                       cmListFileBacktrace const& backtrace,
-                      std::vector<cmGeneratorExpressionEvaluator*> evaluators,
+                      const std::vector<cmGeneratorExpressionEvaluator*> &evaluators,
                       const char *input, bool needsParsing)
   : Backtrace(backtrace), Evaluators(evaluators), Input(input),
     NeedsParsing(needsParsing)
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index cf24948..2755356 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -428,7 +428,7 @@ std::string GeneratorExpressionContent::Evaluate(
   }
 
   int numExpected = node->NumExpectedParameters();
-  if ((numExpected != -1 && unsigned int(numExpected) != parameters.size()))
+  if ((numExpected != -1 && (unsigned int)numExpected != parameters.size()))
     {
     if (numExpected == 0)
       {

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

Summary of changes:
 Source/cmGeneratorExpression.cxx          |    2 +-
 Source/cmGeneratorExpressionEvaluator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake