diff options
-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) |