diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-06-27 20:44:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-28 13:02:26 (GMT) |
| commit | 1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb (patch) | |
| tree | 3c13e63f2529d877b865475b5269a96ef5e0a4cb /Source/cmGeneratorExpressionEvaluationFile.cxx | |
| parent | b4b73f56a26c1e1d630e3f262d2d4bafee8231c4 (diff) | |
| download | CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.zip CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.gz CMake-1d6909a287bb73b5ec7bf51ec56f7efcf2a869eb.tar.bz2 | |
use CM_NULLPTR
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluationFile.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluationFile.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index 5b48eea..f9dbc2d 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -40,8 +40,8 @@ void cmGeneratorExpressionEvaluationFile::Generate( { std::string rawCondition = this->Condition->GetInput(); if (!rawCondition.empty()) { - std::string condResult = - this->Condition->Evaluate(lg, config, false, 0, 0, 0, lang); + std::string condResult = this->Condition->Evaluate( + lg, config, false, CM_NULLPTR, CM_NULLPTR, CM_NULLPTR, lang); if (condResult == "0") { return; } @@ -56,10 +56,10 @@ void cmGeneratorExpressionEvaluationFile::Generate( } } - const std::string outputFileName = - this->OutputFileExpr->Evaluate(lg, config, false, 0, 0, 0, lang); - const std::string outputContent = - inputExpression->Evaluate(lg, config, false, 0, 0, 0, lang); + const std::string outputFileName = this->OutputFileExpr->Evaluate( + lg, config, false, CM_NULLPTR, CM_NULLPTR, CM_NULLPTR, lang); + const std::string outputContent = inputExpression->Evaluate( + lg, config, false, CM_NULLPTR, CM_NULLPTR, CM_NULLPTR, lang); std::map<std::string, std::string>::iterator it = outputFiles.find(outputFileName); @@ -97,8 +97,8 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile( for (std::vector<std::string>::const_iterator le = enabledLanguages.begin(); le != enabledLanguages.end(); ++le) { - std::string name = - this->OutputFileExpr->Evaluate(lg, config, false, 0, 0, 0, *le); + std::string name = this->OutputFileExpr->Evaluate( + lg, config, false, CM_NULLPTR, CM_NULLPTR, CM_NULLPTR, *le); cmSourceFile* sf = lg->GetMakefile()->GetOrCreateSource(name); sf->SetProperty("GENERATED", "1"); |