diff options
author | Brad King <brad.king@kitware.com> | 2014-10-21 19:08:01 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-21 19:08:01 (GMT) |
commit | ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c (patch) | |
tree | 7e4833de51d717fbd989acfe7c1ea1a1594f94d6 /Source/cmInstallCommand.cxx | |
parent | 4f9fcd356b07143a570b39cb5be72d4e3a4e83dc (diff) | |
parent | cc1139cc304b6bd4c8403d437cf08f73e06e243a (diff) | |
download | CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.zip CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.tar.gz CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.tar.bz2 |
Merge topic 'remove-redundant-c_str'
cc1139cc strings: Remove redundant calls to std::string::c_str()
Diffstat (limited to 'Source/cmInstallCommand.cxx')
-rw-r--r-- | Source/cmInstallCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index ec500d9..c3c9c55 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -167,7 +167,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector<std::string> const& args) script += "/"; script += args[i]; } - if(cmSystemTools::FileIsDirectory(script.c_str())) + if(cmSystemTools::FileIsDirectory(script)) { this->SetError("given a directory as value of SCRIPT argument."); return false; @@ -1111,7 +1111,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args) // Make sure the name is a directory. if(cmSystemTools::FileExists(dir.c_str()) && - !cmSystemTools::FileIsDirectory(dir.c_str())) + !cmSystemTools::FileIsDirectory(dir)) { cmOStringStream e; e << args[0] << " given non-directory \"" @@ -1393,7 +1393,7 @@ bool cmInstallCommand::MakeFilesFullPath(const char* modeName, } // Make sure the file is not a directory. - if(gpos == file.npos && cmSystemTools::FileIsDirectory(file.c_str())) + if(gpos == file.npos && cmSystemTools::FileIsDirectory(file)) { cmOStringStream e; e << modeName << " given directory \"" << (*fileIt) << "\" to install."; |