summaryrefslogtreecommitdiff
path: root/Source/CTest/cmCTestVC.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-03-17 09:31:21 -0400
committerBrad King <brad.king@kitware.com>2014-03-17 09:31:21 -0400
commit6e466c6f2ee5160202aaa76a9d643d34bd7d908a (patch)
tree1117fe63347f333a4e20d1698cb791c6c3506e6a /Source/CTest/cmCTestVC.cxx
parentc903b5319bfcf383964c625bb84d7bc958aba2e9 (diff)
parent6313be44aa465ea883e3578b3a0424ae0c217d5c (diff)
downloadcmake-6e466c6f2ee5160202aaa76a9d643d34bd7d908a.tar.gz
Merge branch 'master' into CONFIG-LOCATION-CMP0026
Diffstat (limited to 'Source/CTest/cmCTestVC.cxx')
-rw-r--r--Source/CTest/cmCTestVC.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx
index fbee2272e3..f89fa2ba5a 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());