diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-07-26 11:04:09 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-08-02 06:56:57 (GMT) |
commit | 757a1f54085af4645ee1946329e24538162ac054 (patch) | |
tree | 70bd474560d9d396b4868c80dfe2e4df18c4f347 /Source/cmMakefile.h | |
parent | 52dbe654dea7562564be9d880540e6bc706998ba (diff) | |
download | CMake-757a1f54085af4645ee1946329e24538162ac054.zip CMake-757a1f54085af4645ee1946329e24538162ac054.tar.gz CMake-757a1f54085af4645ee1946329e24538162ac054.tar.bz2 |
cmState: Move PolicyState from cmMakefile.
Implement lexical scope checking in terms of the state stack instead
of barriers.
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r-- | Source/cmMakefile.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 1e5c301..173914e 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -909,7 +909,6 @@ private: void PushPolicy(bool weak = false, cmPolicies::PolicyMap const& pm = cmPolicies::PolicyMap()); void PopPolicy(); - void PushPolicyBarrier(); void PopPolicyBarrier(bool reportError = true); friend class cmCMakePolicyCommand; class IncludeScope; @@ -919,18 +918,6 @@ private: class BuildsystemFileScope; friend class BuildsystemFileScope; - // stack of policy settings - struct PolicyStackEntry: public cmPolicies::PolicyMap - { - typedef cmPolicies::PolicyMap derived; - PolicyStackEntry(bool w = false): derived(), Weak(w) {} - PolicyStackEntry(derived const& d, bool w = false): derived(d), Weak(w) {} - PolicyStackEntry(PolicyStackEntry const& r): derived(r), Weak(r.Weak) {} - bool Weak; - }; - typedef std::vector<PolicyStackEntry> PolicyStackType; - PolicyStackType PolicyStack; - std::vector<PolicyStackType::size_type> PolicyBarriers; // CMP0053 == old cmake::MessageType ExpandVariablesInStringOld( |