diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-10 12:00:36 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-09-10 08:00:41 -0400 |
| commit | 0aab59809caea3cc69a4d24c95a38ea9657943c3 (patch) | |
| tree | e101c708d615308a715e0b1eaf77dd48b3f6105c /Source/cmState.cxx | |
| parent | 62b56b5ec961a6c44cdae598fac98fbde11a0cd3 (diff) | |
| parent | 46855d000fcd624d2e1ea3ce79d0e8c6d0ba614c (diff) | |
| download | cmake-0aab59809caea3cc69a4d24c95a38ea9657943c3.tar.gz | |
Merge topic 'gicv-stdstring'
46855d000f cmCacheManager::GetInitializedCacheValue(): Return as const std::string*
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2357
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 89738f459a..e01bf712b5 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -142,7 +142,8 @@ const char* cmState::GetCacheEntryValue(std::string const& key) const const char* cmState::GetInitializedCacheValue(std::string const& key) const { - return this->CacheManager->GetInitializedCacheValue(key); + const std::string* p = this->CacheManager->GetInitializedCacheValue(key); + return p ? p->c_str() : nullptr; } cmStateEnums::CacheEntryType cmState::GetCacheEntryType( |