diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-28 15:58:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-28 16:00:16 (GMT) |
| commit | e3be80f4fc1d6fedf45666b7d18dda12ef20054e (patch) | |
| tree | dc46b7586ff909e3e625e9778ab2b6bb5c63e31a /Source/cmCacheManager.cxx | |
| parent | b6da71e299ccdd202f1ea35f33cfcfeb36467e1d (diff) | |
| parent | 1398517f315b2b0420972df1dc1e61294ea5f749 (diff) | |
| download | CMake-e3be80f4fc1d6fedf45666b7d18dda12ef20054e.zip CMake-e3be80f4fc1d6fedf45666b7d18dda12ef20054e.tar.gz CMake-e3be80f4fc1d6fedf45666b7d18dda12ef20054e.tar.bz2 | |
Merge topic 'append-std-string'
1398517f31 AppendProperty: convert value param to std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4282
Diffstat (limited to 'Source/cmCacheManager.cxx')
| -rw-r--r-- | Source/cmCacheManager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 265941a..dc9aba1 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -648,8 +648,8 @@ void cmCacheManager::CacheEntry::AppendProperty(const std::string& prop, bool asString) { if (prop == "TYPE") { - this->Type = cmState::StringToCacheEntryType(!value.empty() ? value.c_str() - : "STRING"); + this->Type = + cmState::StringToCacheEntryType(!value.empty() ? value : "STRING"); } else if (prop == "VALUE") { if (!value.empty()) { if (!this->Value.empty() && !asString) { @@ -658,7 +658,7 @@ void cmCacheManager::CacheEntry::AppendProperty(const std::string& prop, this->Value += value; } } else { - this->Properties.AppendProperty(prop, value.c_str(), asString); + this->Properties.AppendProperty(prop, value, asString); } } |