[Cmake-commits] CMake branch, next, updated. v2.8.9-531-g74fb867

[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  74fb867eb6f748030e21aa04f06fef4ab2ce37ad (commit)
       via  c44d1fcb6881f5626fa513a28dbd18b23a6d8a53 (commit)
      from  1fcdc845b376b7a7b624f3c4d2b2283986a2ec9c (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=74fb867eb6f748030e21aa04f06fef4ab2ce37ad
commit 74fb867eb6f748030e21aa04f06fef4ab2ce37ad
Merge: 1fcdc84 c44d1fc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Sep 14 08:26:45 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 14 08:26:45 2012 -0400

    Merge topic 'generator-expression-refactor' into next
    
    c44d1fc Add default constructors to evaluator structs.


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

    Add default constructors to evaluator structs.
    
    Hopefully this clears up the nightly dashboards.

diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index fce916c..2ff20fc 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -54,6 +54,8 @@ struct cmGeneratorExpressionNode
 //----------------------------------------------------------------------------
 static const struct ZeroNode : public cmGeneratorExpressionNode
 {
+  ZeroNode() {}
+
   virtual bool GeneratesContent() const { return false; }
 
   std::string Evaluate(const std::vector<std::string> &,
@@ -68,6 +70,8 @@ static const struct ZeroNode : public cmGeneratorExpressionNode
 //----------------------------------------------------------------------------
 static const struct OneNode : public cmGeneratorExpressionNode
 {
+  OneNode() {}
+
   virtual bool AcceptsSingleArbitraryContentParameter() const { return true; }
 
   std::string Evaluate(const std::vector<std::string> &,
@@ -83,6 +87,7 @@ static const struct OneNode : public cmGeneratorExpressionNode
 #define BOOLEAN_OP_NODE(OPNAME, OP, SUCCESS_VALUE, FAILURE_VALUE) \
 static const struct OP ## Node : public cmGeneratorExpressionNode \
 { \
+  OP ## Node () {} \
 /* We let -1 carry the meaning 'at least one' */ \
   virtual int NumExpectedParameters() const { return -1; } \
  \
@@ -117,6 +122,7 @@ BOOLEAN_OP_NODE(orNode, OR, 0, 1)
 //----------------------------------------------------------------------------
 static const struct NotNode : public cmGeneratorExpressionNode
 {
+  NotNode() {}
   std::string Evaluate(const std::vector<std::string> &parameters,
                        cmGeneratorExpressionContext *context,
                        const GeneratorExpressionContent *content) const
@@ -134,6 +140,7 @@ static const struct NotNode : public cmGeneratorExpressionNode
 //----------------------------------------------------------------------------
 static const struct ConfigurationNode : public cmGeneratorExpressionNode
 {
+  ConfigurationNode() {}
   virtual int NumExpectedParameters() const { return 0; }
 
   std::string Evaluate(const std::vector<std::string> &,
@@ -147,6 +154,8 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode
 //----------------------------------------------------------------------------
 static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
 {
+  ConfigurationTestNode() {}
+
   virtual int NumExpectedParameters() const { return 1; }
 
   std::string Evaluate(const std::vector<std::string> &parameters,
@@ -180,6 +189,8 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
 template<bool linker, bool soname, bool dirQual, bool nameQual>
 struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
 {
+  TargetFilesystemArtifact() {}
+
   virtual int NumExpectedParameters() const { return 1; }
 
   std::string Evaluate(const std::vector<std::string> &parameters,

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

Summary of changes:
 Source/cmGeneratorExpressionEvaluator.cxx |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake