[Cmake-commits] CMake branch, next, updated. v2.8.9-533-gc5c5c9c

[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  c5c5c9cdcde635937084108cbdd8a15f1db478ba (commit)
       via  ebf932d2e02d2099542b2c5bbbfbcc3d3f688eff (commit)
      from  74fb867eb6f748030e21aa04f06fef4ab2ce37ad (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=c5c5c9cdcde635937084108cbdd8a15f1db478ba
commit c5c5c9cdcde635937084108cbdd8a15f1db478ba
Merge: 74fb867 ebf932d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 14 09:51:54 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 14 09:51:54 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    ebf932d Fix initialization order warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebf932d2e02d2099542b2c5bbbfbcc3d3f688eff
commit ebf932d2e02d2099542b2c5bbbfbcc3d3f688eff
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 14 15:50:18 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Sep 14 15:50:18 2012 +0200

    Fix initialization order warning.
    
    And constify while I'm at it.

diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h
index bbd069f..5f16712 100644
--- a/Source/cmGeneratorExpressionLexer.h
+++ b/Source/cmGeneratorExpressionLexer.h
@@ -45,14 +45,14 @@ public:
 
   std::vector<cmGeneratorExpressionToken> Tokenize(const char *input);
 
-  bool GetSawGeneratorExpression()
+  bool GetSawGeneratorExpression() const
   {
     return this->SawGeneratorExpression;
   }
 
 private:
-  bool SawGeneratorExpression;
   bool SawBeginExpression;
+  bool SawGeneratorExpression;
 };
 
 #endif

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

Summary of changes:
 Source/cmGeneratorExpressionLexer.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake