summaryrefslogtreecommitdiffstats
path: root/Source/cmFileCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-07-08 21:52:51 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-07-17 20:14:37 (GMT)
commitfc1c7cf85d045323a38c1de7ada213ecfee542a9 (patch)
treec5af2358b6ff05121e4cfed187ba58bf1a074681 /Source/cmFileCommand.cxx
parent4dc4570734e70c47c8bb6d658c1014f29068e106 (diff)
downloadCMake-fc1c7cf85d045323a38c1de7ada213ecfee542a9.zip
CMake-fc1c7cf85d045323a38c1de7ada213ecfee542a9.tar.gz
CMake-fc1c7cf85d045323a38c1de7ada213ecfee542a9.tar.bz2
Genex: Store a backtrace, not a pointer to one.
The storage of a pointer means that the ownership and lifetime are externally determined, which is harder to reason about. It also imposes API constraints, requiring APIs to return references to backtraces. This pointer storage was introduced in commit v3.1.0-rc1~425^2~3 (genex: remove the need for backtraces, 2014-05-23). As backtraces are now cheap to copy around, just do that instead.
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r--Source/cmFileCommand.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index f740020..3d84f38 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3565,11 +3565,11 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName,
{
cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
- cmGeneratorExpression outputGe(&lfbt);
+ cmGeneratorExpression outputGe(lfbt);
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputCge
= outputGe.Parse(outputExpr);
- cmGeneratorExpression conditionGe(&lfbt);
+ cmGeneratorExpression conditionGe(lfbt);
cmsys::auto_ptr<cmCompiledGeneratorExpression> conditionCge
= conditionGe.Parse(condition);