Integrate C++11 branch into 5_1-new

This commit is contained in:
teejusb
2019-06-22 12:35:38 -07:00
444 changed files with 19503 additions and 21007 deletions
+2 -2
View File
@@ -799,9 +799,9 @@ bool ScreenMapControllers::SanityCheckWrapper()
}
else
{
FOREACH(RString, reasons_not_sane, reason)
for (RString &reason : reasons_not_sane)
{
*reason= THEME->GetString("ScreenMapControllers", *reason);
reason= THEME->GetString("ScreenMapControllers", reason);
}
RString joined_reasons= join("\n", reasons_not_sane);
joined_reasons= THEME->GetString("ScreenMapControllers", "VitalButtons") + "\n" + joined_reasons;