diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-12 14:42:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-12 14:42:38 (GMT) |
| commit | cb8f87f6229359790956a6640639bbe6b8c346f7 (patch) | |
| tree | 3501cbf4a528b475b8da15b88e0b14879bddd4c2 /Source/cmInstallFilesCommand.cxx | |
| parent | 9defc45f78d4fe10928fd0a94ffa97fc80f5da56 (diff) | |
| parent | 3be265b304da0879c79e2fcdfff6f25b1a4e87c1 (diff) | |
| download | CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.zip CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.tar.gz CMake-cb8f87f6229359790956a6640639bbe6b8c346f7.tar.bz2 | |
Merge topic 'remove-c_str-calls'
3be265b3 Workaround Sun C++ 5.9 compiler crash
af8a1643 Remove c_str calls when using stream APIs.
21c573f6 Remove some c_str() calls.
Diffstat (limited to 'Source/cmInstallFilesCommand.cxx')
| -rw-r--r-- | Source/cmInstallFilesCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index 488d486..7eabbef 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -100,9 +100,9 @@ void cmInstallFilesCommand::FinalPass() else // reg exp list { std::vector<std::string> files; - std::string regex = this->FinalArgs[0].c_str(); + std::string regex = this->FinalArgs[0]; cmSystemTools::Glob(this->Makefile->GetCurrentDirectory(), - regex.c_str(), files); + regex, files); std::vector<std::string>::iterator s = files.begin(); // for each argument, get the files |