mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'revert-definition-map-lookup'

Browse Source 
d1b62185 Merge branch 'parent-scope-tests' into variable-pull-failure
5f414cef Revert "cmDefinitions: Don't store parent lookups"
e0c0b1ac test: add a test for PARENT_SCOPE with multiple scopes
064c415d test: add test for PARENT_SCOPE behavior
This commit is contained in:
Brad King
2014-10-27 08:32:26 -04:00
committed by CMake Topic Stage
parent 21cf9364f0 d1b62185d6
commit 8eb64831be
8 changed files with 276 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmDefinitions.h
View File

@@ -36,11 +36,9 @@ public:
/** Returns the parent scope, if any. */
cmDefinitions* GetParent() const { return this->Up; }
/** Get the value associated with a key; null if none. */
const char* Get(const std::string& key) const;
/** Pull a variable from the parent. */
void Pull(const std::string& key);
/** Get the value associated with a key; null if none.
Store the result locally if it came from a parent. */
const char* Get(const std::string& key);
/** Set (or unset if null) a value associated with a key. */
const char* Set(const std::string& key, const char* value);
@@ -82,7 +80,7 @@ private:
MapType Map;
// Internal query and update methods.
Def const& GetInternal(const std::string& key) const;
Def const& GetInternal(const std::string& key);
Def const& SetInternal(const std::string& key, Def const& def);
// Implementation of Closure() method.