Ver código fonte

Merge topic 'rename-genex-method'

cfae430 Genex: Rename cmGeneratorExpression::NeedsParsing to NeedsEvaluation
Brad King 12 anos atrás
pai
commit
5f9de609dd
2 arquivos alterados com 4 adições e 4 exclusões
  1. 3 3
      Source/cmGeneratorExpression.cxx
  2. 1 1
      Source/cmGeneratorExpression.h

+ 3 - 3
Source/cmGeneratorExpression.cxx

@@ -71,7 +71,7 @@ const char *cmCompiledGeneratorExpression::Evaluate(
   cmTarget *currentTarget,
   cmGeneratorExpressionDAGChecker *dagChecker) const
 {
-  if (!this->NeedsParsing)
+  if (!this->NeedsEvaluation)
     {
     return this->Input.c_str();
     }
@@ -129,9 +129,9 @@ cmCompiledGeneratorExpression::cmCompiledGeneratorExpression(
   cmGeneratorExpressionLexer l;
   std::vector<cmGeneratorExpressionToken> tokens =
                                               l.Tokenize(this->Input.c_str());
-  this->NeedsParsing = l.GetSawGeneratorExpression();
+  this->NeedsEvaluation = l.GetSawGeneratorExpression();
 
-  if (this->NeedsParsing)
+  if (this->NeedsEvaluation)
     {
     cmGeneratorExpressionParser p(tokens);
     p.Parse(this->Evaluators);

+ 1 - 1
Source/cmGeneratorExpression.h

@@ -126,7 +126,7 @@ private:
   cmListFileBacktrace Backtrace;
   std::vector<cmGeneratorExpressionEvaluator*> Evaluators;
   const std::string Input;
-  bool NeedsParsing;
+  bool NeedsEvaluation;
 
   mutable std::set<cmTarget*> DependTargets;
   mutable std::set<cmTarget*> AllTargetsSeen;