Merge branch 'master' into android-new-control-input-overlay

Conflicts:
	Source/Core/DolphinWX/Src/Android/ButtonManager.h

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
index 856b5d9fa5..9ad3e013c6 100644
--- a/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
@@ -43,16 +43,16 @@ static VertexLoaderMap g_VertexLoaderMap;
 void Init()
 {
 	MarkAllDirty();
-	for (int i = 0; i < 8; i++)
-		g_VertexLoaders[i] = NULL;
+	for (auto& vertexLoader : g_VertexLoaders)
+		vertexLoader = NULL;
 	RecomputeCachedArraybases();
 }
 
 void Shutdown()
 {
-	for (VertexLoaderMap::iterator iter = g_VertexLoaderMap.begin(); iter != g_VertexLoaderMap.end(); ++iter)
+	for (auto& p : g_VertexLoaderMap)
 	{
-		delete iter->second;
+		delete p.second;
 	}
 	g_VertexLoaderMap.clear();
 }