summaryrefslogtreecommitdiffstats
path: root/Source/cmDefinitions.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-17 11:21:02 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-19 20:36:51 (GMT)
commitea7b962be2f157f60f143725948e56b2f9f07042 (patch)
treeb76cc40154964fa0853a6aa71ae814737b034da8 /Source/cmDefinitions.h
parentc8cb66880c233414b6656ea3d23776f9ba07a4e4 (diff)
downloadCMake-ea7b962be2f157f60f143725948e56b2f9f07042.zip
CMake-ea7b962be2f157f60f143725948e56b2f9f07042.tar.gz
CMake-ea7b962be2f157f60f143725948e56b2f9f07042.tar.bz2
cmMakefile: Raise variable in scope explicitly when needed.
The Get method implicitly pulls a copy of all variables into a local scope. This is not necessary.
Diffstat (limited to 'Source/cmDefinitions.h')
-rw-r--r--Source/cmDefinitions.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h
index bf791ed..17b9c7c 100644
--- a/Source/cmDefinitions.h
+++ b/Source/cmDefinitions.h
@@ -35,11 +35,11 @@ class cmDefinitions
typedef std::list<cmDefinitions>::reverse_iterator StackIter;
typedef std::list<cmDefinitions>::const_reverse_iterator StackConstIter;
public:
- /** Get the value associated with a key; null if none.
- Store the result locally if it came from a parent. */
static const char* Get(const std::string& key,
StackIter begin, StackIter end);
+ static void Raise(const std::string& key, StackIter begin, StackIter end);
+
/** Set (or unset if null) a value associated with a key. */
void Set(const std::string& key, const char* value);
@@ -80,7 +80,7 @@ private:
MapType Map;
static Def const& GetInternal(const std::string& key,
- StackIter begin, StackIter end);
+ StackIter begin, StackIter end, bool raise);
};
#endif