diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-12 20:08:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-12 20:08:24 (GMT) |
| commit | c54ed7813fa4efe2c6c95b6ba75c02b78b601a26 (patch) | |
| tree | a2c5a6f01143055ed11d497354afcbc75041438d /Source | |
| parent | a2ce4e81d554fd176070893ad420a53516d016c7 (diff) | |
| download | CMake-c54ed7813fa4efe2c6c95b6ba75c02b78b601a26.zip CMake-c54ed7813fa4efe2c6c95b6ba75c02b78b601a26.tar.gz CMake-c54ed7813fa4efe2c6c95b6ba75c02b78b601a26.tar.bz2 | |
cmState: Rename CallStack snapshots to IncludeFile
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefile.cxx | 2 | ||||
| -rw-r--r-- | Source/cmState.cxx | 10 | ||||
| -rw-r--r-- | Source/cmState.h | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7ca005d..7be6b88 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -333,7 +333,7 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf, this->Makefile->PushFunctionBlockerBarrier(); this->Makefile->StateSnapshot = - this->Makefile->GetState()->CreateCallStackSnapshot( + this->Makefile->GetState()->CreateIncludeFileSnapshot( this->Makefile->StateSnapshot, this->Makefile->ContextStack.back()->Name, this->Makefile->ContextStack.back()->Line, diff --git a/Source/cmState.cxx b/Source/cmState.cxx index b8e604b..be8e418 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -931,16 +931,16 @@ cmState::CreateMacroCallSnapshot(cmState::Snapshot originSnapshot, } cmState::Snapshot -cmState::CreateCallStackSnapshot(cmState::Snapshot originSnapshot, - const std::string& entryPointCommand, - long entryPointLine, - const std::string& fileName) +cmState::CreateIncludeFileSnapshot(cmState::Snapshot originSnapshot, + const std::string& entryPointCommand, + long entryPointLine, + const std::string& fileName) { PositionType pos = this->SnapshotData.Push(originSnapshot.Position, *originSnapshot.Position); pos->EntryPointLine = entryPointLine; pos->EntryPointCommand = entryPointCommand; - pos->SnapshotType = CallStackType; + pos->SnapshotType = IncludeFileType; pos->Keep = true; pos->ExecutionListFile = this->ExecutionListFiles.Push( originSnapshot.Position->ExecutionListFile, fileName); diff --git a/Source/cmState.h b/Source/cmState.h index 6717481..ef61406 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -42,7 +42,7 @@ public: BuildsystemDirectoryType, FunctionCallType, MacroCallType, - CallStackType, + IncludeFileType, InlineListFileType, PolicyScopeType, VariableScopeType @@ -203,10 +203,10 @@ public: std::string const& entryPointCommand, long entryPointLine, std::string const& fileName); - Snapshot CreateCallStackSnapshot(Snapshot originSnapshot, - std::string const& entryPointCommand, - long entryPointLine, - std::string const& fileName); + Snapshot CreateIncludeFileSnapshot(Snapshot originSnapshot, + std::string const& entryPointCommand, + long entryPointLine, + std::string const& fileName); Snapshot CreateVariableScopeSnapshot(Snapshot originSnapshot, std::string const& entryPointCommand, long entryPointLine); |