ENH: Refactor policy stack representation

This defines PolicyMap as a public member of cmPolicies.  Its previous
role as a policy stack entry is now called PolicyStackEntry and
represented as a class to which more information can be added later.

1 files changed, 9 insertions, 3 deletions

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index c6061d7..4daec16 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -931,9 +931,15 @@ private:
   std::map<cmStdString, cmTarget*> ImportedTargets;
   
   // stack of policy settings
-  typedef std::map<cmPolicies::PolicyID,
-                   cmPolicies::PolicyStatus> PolicyMap;
-  std::vector<PolicyMap> PolicyStack;
+  struct PolicyStackEntry: public cmPolicies::PolicyMap
+  {
+    typedef cmPolicies::PolicyMap derived;
+    PolicyStackEntry(): derived() {}
+    PolicyStackEntry(derived const& d): derived(d) {}
+    PolicyStackEntry(PolicyStackEntry const& r): derived(r) {}
+  };
+  typedef std::vector<PolicyStackEntry> PolicyStackType;
+  PolicyStackType PolicyStack;
   cmPolicies::PolicyStatus GetPolicyStatusInternal(cmPolicies::PolicyID id);
 
   bool CheckCMP0000;