Integrate C++11 branch into 5_1-new

2019-06-22 12:35:38 -07:00
parent 708139f56e e348b27684
commit 7e3789b131
444 changed files with 19503 additions and 21007 deletions
@@ -219,8 +219,8 @@ static void Deserialize( Song &out, const Json::Value &root )
 	{
 		vector<Steps*> vpSteps;
 		JsonUtil::DeserializeVectorPointersParam<Steps,Song*>( vpSteps, Deserialize, root["Charts"], &out );
-		FOREACH( Steps*, vpSteps, iter )
-			out.AddSteps( *iter );
+		for (Steps *step : vpSteps)
+			out.AddSteps( step );
 	}
 }