diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-06 13:38:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-06 13:38:24 (GMT) |
| commit | 73e3de381d87a635e303e2076a46cb739466c1a4 (patch) | |
| tree | a2e04b18092be4f780a0daf3c26337b126657d70 /Source/cmMakefile.h | |
| parent | 370e2c6785ce9167c9945763505353816780326c (diff) | |
| parent | 757a1f54085af4645ee1946329e24538162ac054 (diff) | |
| download | CMake-73e3de381d87a635e303e2076a46cb739466c1a4.zip CMake-73e3de381d87a635e303e2076a46cb739466c1a4.tar.gz CMake-73e3de381d87a635e303e2076a46cb739466c1a4.tar.bz2 | |
Merge topic 'cmState-policies'
757a1f54 cmState: Move PolicyState from cmMakefile.
52dbe654 cmState: Record the end position of each directory.
65a5e0c6 cmLinkedTree: Add Clear API.
34835433 cmState: Add Type for policy scope.
af0de01c cmState: Remove call stack parent tracking.
6ae8b30b cmMakefile: Move policy barriers inside cmState scopes.
a5fc17b5 cmMakefile: Re-order policy entries and barriers.
0a01e6c6 cmState: Add Snapshot Type accessor.
f0005bb4 Tests: Verify generate-time policy scope behavior.
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 c16ab3d..27e5bce 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -918,7 +918,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; @@ -928,18 +927,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( |