diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2019-05-14 13:16:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-15 14:20:05 (GMT) |
| commit | 23e8364aedcbeb7ce606b6075c98827e52f0c7f6 (patch) | |
| tree | 66d765b7cc87c36b24efa83b4749ee0959863666 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | e2d0aea2c734c8c5028f3573082e75bd157dbe72 (diff) | |
| download | CMake-23e8364aedcbeb7ce606b6075c98827e52f0c7f6.zip CMake-23e8364aedcbeb7ce606b6075c98827e52f0c7f6.tar.gz CMake-23e8364aedcbeb7ce606b6075c98827e52f0c7f6.tar.bz2 | |
Source: std::string related cleanup
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 1b973e0..8d69f3f 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -571,7 +571,7 @@ void cmGlobalNinjaGenerator::CheckNinjaFeatures() static std::string const k_DYNDEP_ = ".dyndep-"; std::string::size_type pos = this->NinjaVersion.find(k_DYNDEP_); if (pos != std::string::npos) { - const char* fv = this->NinjaVersion.c_str() + pos + k_DYNDEP_.size(); + const char* fv = &this->NinjaVersion[pos + k_DYNDEP_.size()]; cmSystemTools::StringToULong(fv, &this->NinjaSupportsDyndeps); } } @@ -1245,7 +1245,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os) for (std::string const& i : unknownExplicitDepends) { // verify the file is in the build directory std::string const absDepPath = - cmSystemTools::CollapseFullPath(i, rootBuildDirectory.c_str()); + cmSystemTools::CollapseFullPath(i, rootBuildDirectory); bool const inBuildDir = cmSystemTools::IsSubDirectory(absDepPath, rootBuildDirectory); if (inBuildDir) { |