diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-18 15:17:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-18 15:18:00 (GMT) |
| commit | a8f628c0a456f74680bfdad0050f2614dbe50853 (patch) | |
| tree | f072a8939837a3d6f954993fdbb9b54e43cdf1f0 /Source/cmMakefile.h | |
| parent | 7adf3aabd55dd80784727a229a37c394740db628 (diff) | |
| parent | f4ff60a803170311f49511a60a381eef8b78c5dd (diff) | |
| download | CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.zip CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.tar.gz CMake-a8f628c0a456f74680bfdad0050f2614dbe50853.tar.bz2 | |
Merge topic 'getsafedef-stdstring'
f4ff60a803 cmMakefile: Make GetSafeDefinition return std::string const&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2350
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 54730b5..bb01c0b 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -432,7 +432,8 @@ public: * cache is then queried. */ const char* GetDefinition(const std::string&) const; - const char* GetSafeDefinition(const std::string&) const; + const std::string* GetDef(const std::string&) const; + const std::string& GetSafeDefinition(const std::string&) const; std::string GetRequiredDefinition(const std::string& name) const; bool IsDefinitionSet(const std::string&) const; /** |