diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-18 19:28:45 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-18 19:28:45 (GMT) |
| commit | 1205f75e3bd9e5ff7051459cac4594ea7c3a9bf9 (patch) | |
| tree | 833b56b9b8d93806248e4fee54850400ed83d421 /Source/cmState.cxx | |
| parent | 163991dd83cac6afa0f6dfeec41d885e8b880fc8 (diff) | |
| download | CMake-1205f75e3bd9e5ff7051459cac4594ea7c3a9bf9.zip CMake-1205f75e3bd9e5ff7051459cac4594ea7c3a9bf9.tar.gz CMake-1205f75e3bd9e5ff7051459cac4594ea7c3a9bf9.tar.bz2 | |
cmState: Move nested struct into separate top-level namespace
Add a friend declaration to give the struct access to
cmState::PositionType. This will be removed when that type is also
extracted.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 0e73879..86d238a 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -35,7 +35,7 @@ struct cmState::SnapshotDataType cmState::SnapshotType SnapshotType; bool Keep; cmLinkedTree<std::string>::iterator ExecutionListFile; - cmLinkedTree<cmState::BuildsystemDirectoryStateType>::iterator + cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator BuildSystemDirectory; cmLinkedTree<cmDefinitions>::iterator Vars; cmLinkedTree<cmDefinitions>::iterator Root; @@ -66,7 +66,7 @@ struct cmState::PolicyStackEntry : public cmPolicies::PolicyMap bool Weak; }; -struct cmState::BuildsystemDirectoryStateType +struct cmStateDetail::BuildsystemDirectoryStateType { cmState::PositionType DirectoryEnd; @@ -313,7 +313,7 @@ cmState::Snapshot cmState::Reset() this->ExecutionListFiles.Truncate(); { - cmLinkedTree<BuildsystemDirectoryStateType>::iterator it = + cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator it = this->BuildsystemDirectory.Truncate(); it->IncludeDirectories.clear(); it->IncludeDirectoryBacktraces.clear(); @@ -1119,7 +1119,7 @@ cmPolicies::PolicyStatus cmState::Snapshot::GetPolicy( return status; } - cmLinkedTree<BuildsystemDirectoryStateType>::iterator dir = + cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator dir = this->Position->BuildSystemDirectory; while (true) { @@ -1366,7 +1366,7 @@ void cmState::Snapshot::InitializeFromParent_ForSubdirsCommand() } cmState::Directory::Directory( - cmLinkedTree<BuildsystemDirectoryStateType>::iterator iter, + cmLinkedTree<cmStateDetail::BuildsystemDirectoryStateType>::iterator iter, const cmState::Snapshot& snapshot) : DirectoryState(iter) , Snapshot_(snapshot) |