diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-24 19:31:45 (GMT) |
| commit | aaa6c8a6cefff2fc8938453f09fb91523b9e87e4 (patch) | |
| tree | fd186e3ee9ba0c4d514baa27d78b8553bcedcb70 /Source/CTest/cmCTestVC.cxx | |
| parent | faf291a9c41cc2a4ffa6797c1d35c7863118a4c4 (diff) | |
| parent | d64ee80d6bfb97a63953796074e792f4883e5fb2 (diff) | |
| download | CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.zip CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.gz CMake-aaa6c8a6cefff2fc8938453f09fb91523b9e87e4.tar.bz2 | |
Merge branch 'master' into doc-singlehtml
Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help
options from both sides.
Diffstat (limited to 'Source/CTest/cmCTestVC.cxx')
| -rw-r--r-- | Source/CTest/cmCTestVC.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx index fbee227..f89fa2b 100644 --- a/Source/CTest/cmCTestVC.cxx +++ b/Source/CTest/cmCTestVC.cxx @@ -63,9 +63,9 @@ bool cmCTestVC::InitialCheckout(const char* command) } // Construct the initial checkout command line. - std::vector<cmStdString> args = cmSystemTools::ParseArguments(command); + std::vector<std::string> args = cmSystemTools::ParseArguments(command); std::vector<char const*> vc_co; - for(std::vector<cmStdString>::const_iterator ai = args.begin(); + for(std::vector<std::string>::const_iterator ai = args.begin(); ai != args.end(); ++ai) { vc_co.push_back(ai->c_str()); |