diff options
author | Stephen Kelly <steveire@gmail.com> | 2016-10-18 19:28:46 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2016-10-18 19:28:46 (GMT) |
commit | 5bc964eddbee7936f05ab758c7ac417fffbe4a3e (patch) | |
tree | 5f712e2f92deba0b117547307fec1573f14bcc1d /Source/cmState.h | |
parent | 2dc409964858c96125948082a2c488bd573b8269 (diff) | |
download | CMake-5bc964eddbee7936f05ab758c7ac417fffbe4a3e.zip CMake-5bc964eddbee7936f05ab758c7ac417fffbe4a3e.tar.gz CMake-5bc964eddbee7936f05ab758c7ac417fffbe4a3e.tar.bz2 |
cmState: Move PositionType to separate namespace
Remove friend declarations supporting it being a nested type.
Diffstat (limited to 'Source/cmState.h')
-rw-r--r-- | Source/cmState.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmState.h b/Source/cmState.h index 34f9fd0..4fcbb00 100644 --- a/Source/cmState.h +++ b/Source/cmState.h @@ -27,14 +27,11 @@ namespace cmStateDetail { struct BuildsystemDirectoryStateType; struct SnapshotDataType; struct PolicyStackEntry; +typedef cmLinkedTree<cmStateDetail::SnapshotDataType>::iterator PositionType; } class cmState { - typedef cmLinkedTree<cmStateDetail::SnapshotDataType>::iterator PositionType; - friend class Snapshot; - friend struct cmStateDetail::BuildsystemDirectoryStateType; - friend struct cmStateDetail::SnapshotDataType; public: cmState(); @@ -58,7 +55,7 @@ public: { public: Snapshot(cmState* state = CM_NULLPTR); - Snapshot(cmState* state, PositionType position); + Snapshot(cmState* state, cmStateDetail::PositionType position); const char* GetDefinition(std::string const& name) const; bool IsInitialized(std::string const& name) const; @@ -117,7 +114,7 @@ public: void InitializeFromParent(); cmState* State; - cmState::PositionType Position; + cmStateDetail::PositionType Position; }; class Directory |