diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-13 17:30:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-03-13 17:32:17 (GMT) |
| commit | 60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14 (patch) | |
| tree | 575fad8fdaf9dd42c0d88785a5aa6b361406fe80 /Source/cmState.cxx | |
| parent | 3766633b8a49cb24f4849721bb22a0feb9ba1f60 (diff) | |
| download | CMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.zip CMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.tar.gz CMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.tar.bz2 | |
cmPropertyMap: Introduce cmProp as return type for GetProperty() functions
Currently properties are usually stored internally as `std::string`.
However, family of GetProperty() functions return them as `const char *` using `c_str()`.
The proposed `cmProp`, typedef'ed as `const std::string *` will expose properties
more naturally.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 9fc7615..1e2d83e 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -625,7 +625,8 @@ const char* cmState::GetGlobalProperty(const std::string& prop) } #undef STRING_LIST_ELEMENT - return this->GlobalProperties.GetPropertyValue(prop); + cmProp retVal = this->GlobalProperties.GetPropertyValue(prop); + return retVal ? retVal->c_str() : nullptr; } bool cmState::GetGlobalPropertyAsBool(const std::string& prop) |