kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmState-rename-include-snapshot'

Browse Source 
c54ed781 cmState: Rename CallStack snapshots to IncludeFile
This commit is contained in:
Brad King 2016-04-13 09:58:21 -04:00 committed by CMake Topic Stage
commit f5da19edd0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefile.cxx
View File

@ -333,7 +333,7 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf,
this->Makefile->PushFunctionBlockerBarrier(); this->Makefile->PushFunctionBlockerBarrier();
this->Makefile->StateSnapshot = this->Makefile->StateSnapshot =
this->Makefile->GetState()->CreateCallStackSnapshot( this->Makefile->GetState()->CreateIncludeFileSnapshot(
this->Makefile->StateSnapshot, this->Makefile->StateSnapshot,
this->Makefile->ContextStack.back()->Name, this->Makefile->ContextStack.back()->Name,
this->Makefile->ContextStack.back()->Line, this->Makefile->ContextStack.back()->Line,

4
Source/cmState.cxx
View File

@ -931,7 +931,7 @@ cmState::CreateMacroCallSnapshot(cmState::Snapshot originSnapshot,
} }
cmState::Snapshot cmState::Snapshot
cmState::CreateCallStackSnapshot(cmState::Snapshot originSnapshot, cmState::CreateIncludeFileSnapshot(cmState::Snapshot originSnapshot,
const std::string& entryPointCommand, const std::string& entryPointCommand,
long entryPointLine, long entryPointLine,
const std::string& fileName) const std::string& fileName)
@ -940,7 +940,7 @@ cmState::CreateCallStackSnapshot(cmState::Snapshot originSnapshot,
*originSnapshot.Position); *originSnapshot.Position);
pos->EntryPointLine = entryPointLine; pos->EntryPointLine = entryPointLine;
pos->EntryPointCommand = entryPointCommand; pos->EntryPointCommand = entryPointCommand;
pos->SnapshotType = CallStackType; pos->SnapshotType = IncludeFileType;
pos->Keep = true; pos->Keep = true;
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);

4
Source/cmState.h
View File

@ -42,7 +42,7 @@ public:
BuildsystemDirectoryType, BuildsystemDirectoryType,
FunctionCallType, FunctionCallType,
MacroCallType, MacroCallType,
CallStackType, IncludeFileType,
InlineListFileType, InlineListFileType,
PolicyScopeType, PolicyScopeType,
VariableScopeType VariableScopeType
@ -203,7 +203,7 @@ public:
std::string const& entryPointCommand, std::string const& entryPointCommand,
long entryPointLine, long entryPointLine,
std::string const& fileName); std::string const& fileName);
Snapshot CreateCallStackSnapshot(Snapshot originSnapshot, Snapshot CreateIncludeFileSnapshot(Snapshot originSnapshot,
std::string const& entryPointCommand, std::string const& entryPointCommand,
long entryPointLine, long entryPointLine,
std::string const& fileName); std::string const& fileName);