diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-02 13:19:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-02 13:19:37 (GMT) |
| commit | 78d1a2d0bbda1798ffc71b11a181d376914bdc3c (patch) | |
| tree | d9c01f2146c5e9beeb354cf26f9ceacea6fdf3dc /Source/cmGlobalGenerator.cxx | |
| parent | 0a082be80086931557df57a7171e80187ddf8aa8 (diff) | |
| parent | db2d46e2ddbdf1c5d942e70b341e085f84e79c13 (diff) | |
| download | CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.zip CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.gz CMake-78d1a2d0bbda1798ffc71b11a181d376914bdc3c.tar.bz2 | |
Merge topic 'string-npos-cleanup'
db2d46e2 Remove second arg: npos in substr usages
8b6f439e Access string npos without instance
389ed56f cmLocalUnixMakefileGenerator3: Remove unnecessary local variable
9fe4a9e2 cmParseBlanketJSCoverage: Pass unmodified parameter as const&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !905
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index f3eb249..67e272d 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -306,7 +306,7 @@ bool cmGlobalGenerator::FindMakeProgram(cmMakefile* mf) // if there are spaces in the make program use short path // but do not short path the actual program name, as // this can cause trouble with VSExpress - if (makeProgram.find(' ') != makeProgram.npos) { + if (makeProgram.find(' ') != std::string::npos) { std::string dir; std::string file; cmSystemTools::SplitProgramPath(makeProgram, dir, file); @@ -2730,7 +2730,7 @@ void cmGlobalGenerator::CheckRuleHashes(std::string const& pfile, } // Get the filename. - fname = line.substr(33, line.npos); + fname = line.substr(33); // Look for a hash for this file's rule. std::map<std::string, RuleHash>::const_iterator rhi = |