summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-24 18:06:42 (GMT)
committerBrad King <brad.king@kitware.com>2015-11-25 00:38:33 (GMT)
commitd85c9176ae15f4fb203e501d777cfce8304bf256 (patch)
tree68f8abc2ee0f524d00eddc852c3242beb63f241a
parent8e1be7bf688dc282408aa0403e9896fa5a142ec4 (diff)
downloadCMake-d85c9176ae15f4fb203e501d777cfce8304bf256.zip
CMake-d85c9176ae15f4fb203e501d777cfce8304bf256.tar.gz
CMake-d85c9176ae15f4fb203e501d777cfce8304bf256.tar.bz2
cmMakefile: Remove unused PolicyPushPop interfaces
The PolicyPushPop constructor arguments and Quiet method were used to pass non-default arguments to PushPolicy and PopSnapshot, but no clients use them anymore.
-rw-r--r--Source/cmMakefile.cxx8
-rw-r--r--Source/cmMakefile.h6
2 files changed, 4 insertions, 10 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2c05628..6888882 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4601,20 +4601,18 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id,
}
//----------------------------------------------------------------------------
-cmMakefile::PolicyPushPop::PolicyPushPop(cmMakefile* m, bool weak,
- cmPolicies::PolicyMap const& pm):
- Makefile(m), ReportError(true)
+cmMakefile::PolicyPushPop::PolicyPushPop(cmMakefile* m): Makefile(m)
{
this->Makefile->StateSnapshot = this->Makefile->StateSnapshot.GetState()
->CreatePolicyScopeSnapshot(this->Makefile->StateSnapshot);
- this->Makefile->PushPolicy(weak, pm);
+ this->Makefile->PushPolicy();
}
//----------------------------------------------------------------------------
cmMakefile::PolicyPushPop::~PolicyPushPop()
{
this->Makefile->PopPolicy();
- this->Makefile->PopSnapshot(this->ReportError);
+ this->Makefile->PopSnapshot();
}
//----------------------------------------------------------------------------
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index a112d57..1edffdc 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -321,14 +321,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;