diff options
| author | Pavel Solodovnikov <hellyeahdominate@gmail.com> | 2018-01-31 15:20:02 (GMT) |
|---|---|---|
| committer | Pavel Solodovnikov <hellyeahdominate@gmail.com> | 2018-01-31 15:23:03 (GMT) |
| commit | 653b894683abe63233cb8679b34ea39d9017e317 (patch) | |
| tree | 200e5066b754d8ddfdc7beb86c4db179aa2e69d0 /Source/cmState.cxx | |
| parent | 4499cc8bb65e217e1cb2959452ed391af82e757b (diff) | |
| download | CMake-653b894683abe63233cb8679b34ea39d9017e317.zip CMake-653b894683abe63233cb8679b34ea39d9017e317.tar.gz CMake-653b894683abe63233cb8679b34ea39d9017e317.tar.bz2 | |
Reduce raw string pointers usage.
* Change some functions to take `std::string` instead of
`const char*` in the following classes: `cmMakeFile`, `cmake`,
`cmCoreTryCompile`, `cmSystemTools`, `cmState`, `cmLocalGenerator`
and a few others.
* Greatly reduce using of `const char*` overloads for
`cmSystemTools::MakeDirectory` and `cmSystemTools::RelativePath`.
* Remove many redundant `c_str()` conversions throughout the code.
Diffstat (limited to 'Source/cmState.cxx')
| -rw-r--r-- | Source/cmState.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 00d7e9a..bb891b5 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -93,7 +93,7 @@ cmStateEnums::CacheEntryType cmState::StringToCacheEntryType(const char* s) bool cmState::IsCacheEntryType(std::string const& key) { for (int i = 0; cmCacheEntryTypes[i]; ++i) { - if (strcmp(key.c_str(), cmCacheEntryTypes[i]) == 0) { + if (key == cmCacheEntryTypes[i]) { return true; } } @@ -514,9 +514,9 @@ void cmState::SetSourceDirectory(std::string const& sourceDirectory) cmSystemTools::ConvertToUnixSlashes(this->SourceDirectory); } -const char* cmState::GetSourceDirectory() const +std::string const& cmState::GetSourceDirectory() const { - return this->SourceDirectory.c_str(); + return this->SourceDirectory; } void cmState::SetBinaryDirectory(std::string const& binaryDirectory) @@ -595,9 +595,9 @@ unsigned int cmState::GetCacheMinorVersion() const return this->CacheManager->GetCacheMinorVersion(); } -const char* cmState::GetBinaryDirectory() const +std::string const& cmState::GetBinaryDirectory() const { - return this->BinaryDirectory.c_str(); + return this->BinaryDirectory; } cmStateSnapshot cmState::CreateBaseSnapshot() |