Merge branch 'master' into string

2026-09-04 18:46:37 +00:00 · 2013-05-23 00:56:27 -07:00
parent e6fba5ba82 320494c83d
commit 2840e32853
3 changed files with 5 additions and 12 deletions
@@ -165,8 +165,8 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	// Create the child process.

 	//glue together all the nice command line arguments
-	string args(it->program);
-	vector<string>::iterator cur, end;
+	std::string args(it->program);
+	std::vector<std::string>::iterator cur, end;
 	cur = it->args.begin();
 	end = it->args.end();
 	for(; cur != end; cur++) {