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

Merge topic 'cmState-rename-include-snapshot' 

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
parent eae4cee0b5 c54ed7813f
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->StateSnapshot =
this->Makefile->GetState()->CreateCallStackSnapshot(
this->Makefile->GetState()->CreateIncludeFileSnapshot(
this->Makefile->StateSnapshot,
this->Makefile->ContextStack.back()->Name,
this->Makefile->ContextStack.back()->Line,

10
Source/cmState.cxx
View File

@ -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);

10
Source/cmState.h
View File

@ -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);