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 58a78b529b43e587e2bd151ed5642d55b1e8a073 (commit)
via aa938276115e18d5570aca28972a79eb22ce2cc9 (commit)
from f315bcb5f34e54e5ab2bc6560323aaca7df77a2a (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=58a78b529b43e587e2bd151ed5642d55b1e8a073
commit 58a78b529b43e587e2bd151ed5642d55b1e8a073
Merge: f315bcb aa93827
Author: Stephen Kelly <[email protected]>
AuthorDate: Thu Sep 13 05:35:23 2012 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Thu Sep 13 05:35:23 2012 -0400
Merge topic 'generator-expression-refactor' into next
aa93827 Name the evaluator structs.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa938276115e18d5570aca28972a79eb22ce2cc9
commit aa938276115e18d5570aca28972a79eb22ce2cc9
Author: Stephen Kelly <[email protected]>
AuthorDate: Thu Sep 13 11:28:19 2012 +0200
Commit: Stephen Kelly <[email protected]>
CommitDate: Thu Sep 13 11:28:19 2012 +0200
Name the evaluator structs.
Some machines on the dashboard can't handle anonymous structs.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 79aeb22..22a5b52 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -52,7 +52,7 @@ struct cmGeneratorExpressionNode
};
//----------------------------------------------------------------------------
-static const struct : public cmGeneratorExpressionNode
+static const struct ZeroNode : public cmGeneratorExpressionNode
{
virtual bool GeneratesContent() const { return false; }
@@ -66,7 +66,7 @@ static const struct : public cmGeneratorExpressionNode
} zeroNode;
//----------------------------------------------------------------------------
-static const struct : public cmGeneratorExpressionNode
+static const struct OneNode : public cmGeneratorExpressionNode
{
virtual bool AcceptsSingleArbitraryContentParameter() const { return true; }
@@ -81,7 +81,7 @@ static const struct : public cmGeneratorExpressionNode
//----------------------------------------------------------------------------
#define BOOLEAN_OP_NODE(OPNAME, OP, SUCCESS_VALUE, FAILURE_VALUE) \
-static const struct : public cmGeneratorExpressionNode \
+static const struct OP ## Node : public cmGeneratorExpressionNode \
{ \
/* We let -1 carry the meaning 'at least one' */ \
virtual int NumExpectedParameters() const { return -1; } \
@@ -115,7 +115,7 @@ BOOLEAN_OP_NODE(orNode, OR, 0, 1)
#undef BOOLEAN_OP_NODE
//----------------------------------------------------------------------------
-static const struct : public cmGeneratorExpressionNode
+static const struct NotNode : public cmGeneratorExpressionNode
{
std::string Evaluate(const std::vector<std::string> ¶meters,
cmGeneratorExpressionContext *context,
@@ -132,7 +132,7 @@ static const struct : public cmGeneratorExpressionNode
} notNode;
//----------------------------------------------------------------------------
-static const struct : public cmGeneratorExpressionNode
+static const struct ConfigurationNode : public cmGeneratorExpressionNode
{
virtual int NumExpectedParameters() const { return 0; }
@@ -145,7 +145,7 @@ static const struct : public cmGeneratorExpressionNode
} configurationNode;
//----------------------------------------------------------------------------
-static const struct : public cmGeneratorExpressionNode
+static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
{
virtual int NumExpectedParameters() const { return 1; }
-----------------------------------------------------------------------
Summary of changes:
Source/cmGeneratorExpressionEvaluator.cxx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
