From 942df88bf83e99abbfbd69207369096fa7cf67a2 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 23 May 2015 08:00:46 +0200 Subject: cmState: Rename CreateSnapshot method. Leave the namespace open for other snapshot types. --- Source/cmMakefile.cxx | 2 +- Source/cmState.cxx | 3 ++- Source/cmState.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 7c74a0f..60498ef 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1619,7 +1619,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, } cmState::Snapshot newSnapshot = this->GetState() - ->CreateSnapshot(this->StateSnapshot); + ->CreateBuildsystemDirectorySnapshot(this->StateSnapshot); // create a new local generator and set its parent cmLocalGenerator *lg2 = this->GetGlobalGenerator() diff --git a/Source/cmState.cxx b/Source/cmState.cxx index eade817..87892b4 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -672,7 +672,8 @@ cmState::Snapshot cmState::CreateBaseSnapshot() return cmState::Snapshot(this, pos); } -cmState::Snapshot cmState::CreateSnapshot(Snapshot originSnapshot) +cmState::Snapshot +cmState::CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot) { assert(originSnapshot.IsValid()); PositionType pos = this->ParentPositions.size(); diff --git a/Source/cmState.h b/Source/cmState.h index 157bd90..24e0f7b 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -58,7 +58,7 @@ public: }; Snapshot CreateBaseSnapshot(); - Snapshot CreateSnapshot(Snapshot originSnapshot); + Snapshot CreateBuildsystemDirectorySnapshot(Snapshot originSnapshot); enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC, UNINITIALIZED }; -- cgit v0.12