summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/VertexLoaderManager.cpp
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-02-12 16:00:34 +0100
committerTillmann Karras <tilkax@gmail.com>2014-02-13 09:05:50 +0100
commit404624bf0b0125e5a408021c616ee9b9e2dde382 (patch)
treed2c3cd6256b09ebdc04b8c913b21c2e56d30c2e1 /Source/Core/VideoCommon/VertexLoaderManager.cpp
parent2ff794d299b0426d1f2a523523260efad84a9837 (diff)
Turn loops into range-based form
and some things suggested by cppcheck and compiler warnings.
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderManager.cpp')
-rw-r--r--Source/Core/VideoCommon/VertexLoaderManager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp
index d1f1acf9a4..fbc48e5fb7 100644
--- a/Source/Core/VideoCommon/VertexLoaderManager.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp
@@ -43,7 +43,7 @@ static VertexLoaderMap g_VertexLoaderMap;
void Init()
{
MarkAllDirty();
- for (auto& vertexLoader : g_VertexLoaders)
+ for (VertexLoader*& vertexLoader : g_VertexLoaders)
vertexLoader = NULL;
RecomputeCachedArraybases();
}
@@ -75,19 +75,19 @@ void AppendListToString(std::string *dest)
std::vector<entry> entries;
size_t total_size = 0;
- for (VertexLoaderMap::const_iterator iter = g_VertexLoaderMap.begin(); iter != g_VertexLoaderMap.end(); ++iter)
+ for (const auto& map_entry : g_VertexLoaderMap)
{
entry e;
- iter->second->AppendToString(&e.text);
- e.num_verts = iter->second->GetNumLoadedVerts();
+ map_entry.second->AppendToString(&e.text);
+ e.num_verts = map_entry.second->GetNumLoadedVerts();
entries.push_back(e);
total_size += e.text.size() + 1;
}
sort(entries.begin(), entries.end());
dest->reserve(dest->size() + total_size);
- for (std::vector<entry>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter)
+ for (const entry& entry : entries)
{
- dest->append(iter->text);
+ dest->append(entry.text);
}
}