diff options
author | Pavel Solodovnikov <hellyeahdominate@gmail.com> | 2017-05-30 19:37:46 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-06-01 18:19:51 (GMT) |
commit | 8b6f439ef20cf882b4f3deba48f34a01a98963d9 (patch) | |
tree | 9e42c3ee7dcbfc7f3d99af79a982735339993af5 /Source/cmGlobalGenerator.cxx | |
parent | 389ed56f63653e89b3d640cf7aebdc8ebe7ca643 (diff) | |
download | CMake-8b6f439ef20cf882b4f3deba48f34a01a98963d9.zip CMake-8b6f439ef20cf882b4f3deba48f34a01a98963d9.tar.gz CMake-8b6f439ef20cf882b4f3deba48f34a01a98963d9.tar.bz2 |
Access string npos without instance
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..19597fd 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, std::string::npos); // Look for a hash for this file's rule. std::map<std::string, RuleHash>::const_iterator rhi = |