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
@@ -52,8 +52,8 @@ void RageTexture::GetFrameDimensionsFromFileName( RString sPath, int* piFramesWi
 		return;
 	}
 	// Check for nonsense values.  Some people might not intend the hint. -Kyz
-	int maybe_width= StringToInt(asMatch[0]);
-	int maybe_height= StringToInt(asMatch[1]);
+	int maybe_width= std::stoi(asMatch[0]);
+	int maybe_height= std::stoi(asMatch[1]);
 	if(maybe_width <= 0 || maybe_height <= 0)
 	{
 		*piFramesWide = *piFramesHigh = 1;