diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-02 18:44:35 (GMT) |
| commit | 8018fcca6e055a0f12a17fc8324128080a9ec568 (patch) | |
| tree | accecb14f80dece735e2822b76ad0c88825149b6 /Source/CTest/cmCTestUploadCommand.cxx | |
| parent | a41c0a9dcbc201b183bcc0a0c0f6bf9f2cebd079 (diff) | |
| parent | 5ada4be81bdb7695b2a4741db76ec66473ccd961 (diff) | |
| download | CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.zip CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.gz CMake-8018fcca6e055a0f12a17fc8324128080a9ec568.tar.bz2 | |
Merge branch 'master' into revise-compiler-id-policies
Diffstat (limited to 'Source/CTest/cmCTestUploadCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestUploadCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx index 731c1c7..f7de294 100644 --- a/Source/CTest/cmCTestUploadCommand.cxx +++ b/Source/CTest/cmCTestUploadCommand.cxx @@ -47,7 +47,7 @@ bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg) { if(this->ArgumentDoing == ArgumentDoingFiles) { - cmStdString filename(arg); + std::string filename(arg); if(cmSystemTools::FileExists(filename.c_str())) { this->Files.insert(filename); |