Ver código fonte

cmState: Move SnapshotDataType to separate namespace

Stephen Kelly 9 anos atrás
pai
commit
cb40af5d6f
2 arquivos alterados com 5 adições e 4 exclusões
  1. 1 1
      Source/cmState.cxx
  2. 4 3
      Source/cmState.h

+ 1 - 1
Source/cmState.cxx

@@ -25,7 +25,7 @@ static std::string const kBUILDSYSTEM_TARGETS = "BUILDSYSTEM_TARGETS";
 static std::string const kSOURCE_DIR = "SOURCE_DIR";
 static std::string const kSUBDIRECTORIES = "SUBDIRECTORIES";
 
-struct cmState::SnapshotDataType
+struct cmStateDetail::SnapshotDataType
 {
   cmState::PositionType ScopeParent;
   cmState::PositionType DirectoryParent;

+ 4 - 3
Source/cmState.h

@@ -25,15 +25,16 @@ class cmPropertyDefinition;
 
 namespace cmStateDetail {
 struct BuildsystemDirectoryStateType;
+struct SnapshotDataType;
 }
 
 class cmState
 {
-  struct SnapshotDataType;
   struct PolicyStackEntry;
-  typedef cmLinkedTree<SnapshotDataType>::iterator PositionType;
+  typedef cmLinkedTree<cmStateDetail::SnapshotDataType>::iterator PositionType;
   friend class Snapshot;
   friend struct cmStateDetail::BuildsystemDirectoryStateType;
+  friend struct cmStateDetail::SnapshotDataType;
 
 public:
   cmState();
@@ -341,7 +342,7 @@ private:
   cmLinkedTree<std::string> ExecutionListFiles;
 
   cmLinkedTree<PolicyStackEntry> PolicyStack;
-  cmLinkedTree<SnapshotDataType> SnapshotData;
+  cmLinkedTree<cmStateDetail::SnapshotDataType> SnapshotData;
   cmLinkedTree<cmDefinitions> VarTree;
 
   std::string SourceDirectory;