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

cmState: Rename GetParent method. 

Leave the namespace open for other Parent types.
This commit is contained in:
Stephen Kelly 2015-05-23 08:02:54 +02:00
parent 942df88bf8
commit cf1233a0ea
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.cxx
View File

@ -73,7 +73,7 @@ cmLocalGenerator::~cmLocalGenerator()
bool cmLocalGenerator::IsRootMakefile() const bool cmLocalGenerator::IsRootMakefile() const
{ {
return !this->StateSnapshot.GetParent().IsValid(); return !this->StateSnapshot.GetBuildsystemDirectoryParent().IsValid();
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

3
Source/cmMakefile.cxx
View File

@ -4038,7 +4038,8 @@ const char *cmMakefile::GetProperty(const std::string& prop,
output = ""; output = "";
if (prop == "PARENT_DIRECTORY") if (prop == "PARENT_DIRECTORY")
{ {
cmState::Snapshot parent = this->StateSnapshot.GetParent(); cmState::Snapshot parent =
this->StateSnapshot.GetBuildsystemDirectoryParent();
if(parent.IsValid()) if(parent.IsValid())
{ {
return parent.GetCurrentSourceDirectory(); return parent.GetCurrentSourceDirectory();

6
Source/cmState.cxx
View File

@ -590,7 +590,7 @@ void cmState::Snapshot::ComputeRelativePathTopSource()
snapshots.push_back(snapshot); snapshots.push_back(snapshot);
while (true) while (true)
{ {
snapshot = snapshot.GetParent(); snapshot = snapshot.GetBuildsystemDirectoryParent();
if (snapshot.IsValid()) if (snapshot.IsValid())
{ {
snapshots.push_back(snapshot); snapshots.push_back(snapshot);
@ -622,7 +622,7 @@ void cmState::Snapshot::ComputeRelativePathTopBinary()
snapshots.push_back(snapshot); snapshots.push_back(snapshot);
while (true) while (true)
{ {
snapshot = snapshot.GetParent(); snapshot = snapshot.GetBuildsystemDirectoryParent();
if (snapshot.IsValid()) if (snapshot.IsValid())
{ {
snapshots.push_back(snapshot); snapshots.push_back(snapshot);
@ -775,7 +775,7 @@ bool cmState::Snapshot::IsValid() const
return this->State ? true : false; return this->State ? true : false;
} }
cmState::Snapshot cmState::Snapshot::GetParent() const cmState::Snapshot cmState::Snapshot::GetBuildsystemDirectoryParent() const
{ {
Snapshot snapshot; Snapshot snapshot;
if (!this->State || this->Position == 0) if (!this->State || this->Position == 0)

2
Source/cmState.h
View File

@ -45,7 +45,7 @@ public:
void SetRelativePathTopBinary(const char* dir); void SetRelativePathTopBinary(const char* dir);
bool IsValid() const; bool IsValid() const;
Snapshot GetParent() const; Snapshot GetBuildsystemDirectoryParent() const;
private: private:
void ComputeRelativePathTopSource(); void ComputeRelativePathTopSource();