Merge branch 'reduce-cmState-accumulation' into reduce-cmState-accumulation-for-master

1 files changed, 2 insertions, 6 deletions

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index f1dd374..fa1534d 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -315,14 +315,10 @@ public:
   class PolicyPushPop
   {
   public:
-    PolicyPushPop(cmMakefile* m,
-                  bool weak = false,
-                  cmPolicies::PolicyMap const& pm = cmPolicies::PolicyMap());
+    PolicyPushPop(cmMakefile* m);
     ~PolicyPushPop();
-    void Quiet() { this->ReportError = false; }
   private:
     cmMakefile* Makefile;
-    bool ReportError;
   };
   friend class PolicyPushPop;
 
@@ -878,7 +874,7 @@ private:
   void PushPolicy(bool weak = false,
                   cmPolicies::PolicyMap const& pm = cmPolicies::PolicyMap());
   void PopPolicy();
-  void PopPolicyBarrier(bool reportError = true);
+  void PopSnapshot(bool reportError = true);
   friend class cmCMakePolicyCommand;
   class IncludeScope;
   friend class IncludeScope;