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/cmInstallCommand.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/cmInstallCommand.cxx')
-rw-r--r-- | Source/cmInstallCommand.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 93e467c..f499924 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -1210,7 +1210,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode( // Check the file name. std::string fname = filename.GetString(); - if (fname.find_first_of(":/\\") != fname.npos) { + if (fname.find_first_of(":/\\") != std::string::npos) { std::ostringstream e; e << args[0] << " given invalid export file name \"" << fname << "\". " << "The FILE argument may not contain a path. " @@ -1228,7 +1228,7 @@ bool cmInstallCommand::HandleExportAndroidMKMode( this->SetError(e.str()); return false; } - if (fname.find_first_of(":/\\") != fname.npos) { + if (fname.find_first_of(":/\\") != std::string::npos) { std::ostringstream e; e << args[0] << " given export name \"" << exp.GetString() << "\". " << "This name cannot be safely converted to a file name. " @@ -1302,7 +1302,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args) // Check the file name. std::string fname = filename.GetString(); - if (fname.find_first_of(":/\\") != fname.npos) { + if (fname.find_first_of(":/\\") != std::string::npos) { std::ostringstream e; e << args[0] << " given invalid export file name \"" << fname << "\". " << "The FILE argument may not contain a path. " @@ -1326,7 +1326,7 @@ bool cmInstallCommand::HandleExportMode(std::vector<std::string> const& args) fname = exp.GetString(); fname += ".cmake"; - if (fname.find_first_of(":/\\") != fname.npos) { + if (fname.find_first_of(":/\\") != std::string::npos) { std::ostringstream e; e << args[0] << " given export name \"" << exp.GetString() << "\". " << "This name cannot be safely converted to a file name. " @@ -1391,7 +1391,7 @@ bool cmInstallCommand::MakeFilesFullPath( } // Make sure the file is not a directory. - if (gpos == file.npos && cmSystemTools::FileIsDirectory(file)) { + if (gpos == std::string::npos && cmSystemTools::FileIsDirectory(file)) { std::ostringstream e; e << modeName << " given directory \"" << (*fileIt) << "\" to install."; this->SetError(e.str()); |