diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-30 23:50:45 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-01 17:45:05 (GMT) |
| commit | 6c7dad41d9f5e9b6ab6bdd6ddee837aa5509e19e (patch) | |
| tree | cc8e71402302578db09a24e52bdbe222e9cc7a2c /Source | |
| parent | a7ce0c7bc03efcfff6bf9fecc52663409262d73d (diff) | |
| download | CMake-6c7dad41d9f5e9b6ab6bdd6ddee837aa5509e19e.zip CMake-6c7dad41d9f5e9b6ab6bdd6ddee837aa5509e19e.tar.gz CMake-6c7dad41d9f5e9b6ab6bdd6ddee837aa5509e19e.tar.bz2 | |
cmDefinitions: Make Get method static.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmDefinitions.h | 6 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmDefinitions.h b/Source/cmDefinitions.h index 77edbd0..b244793 100644 --- a/Source/cmDefinitions.h +++ b/Source/cmDefinitions.h @@ -31,9 +31,9 @@ class cmDefinitions public: /** 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, - std::list<cmDefinitions>::reverse_iterator rbegin, - std::list<cmDefinitions>::reverse_iterator rend); + static const char* Get(const std::string& key, + std::list<cmDefinitions>::reverse_iterator rbegin, + std::list<cmDefinitions>::reverse_iterator rend); /** Set (or unset if null) a value associated with a key. */ void Set(const std::string& key, const char* value); diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index b16d7e6..4ed2419 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -65,8 +65,8 @@ public: const char* GetDefinition(std::string const& name) { - return this->VarStack.back().Get(name, this->VarStack.rbegin(), - this->VarStack.rend()); + return cmDefinitions::Get(name, this->VarStack.rbegin(), + this->VarStack.rend()); } void SetDefinition(std::string const& name, std::string const& value) |