commit 16f99b74354b592920440d8ab7fc99c5b42597b1
author Jamie Madill <jmadill@chromium.org> Thu Jul 02 14:09:06 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Jul 03 19:38:08 2015 +0000
tree 0c20d5f8c32bd0331d3d5b3c0fed664272dd4a5c
parent 56eee79f2acac668c6c95a33eb71dfd62edae12d

Fix warnings with code analysis tools.

Variable shadowing and a few other non-bug warnings.

BUG=None

Change-Id: Ibf62d6e7fef91fc213a53a6902f494147ed30ebc
Reviewed-on: https://chromium-review.googlesource.com/283223
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/libANGLE/renderer/d3d/VertexDataManager.cpp

diff --git a/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
index 517e236..00adfc1 100644
--- a/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+++ b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
@@ -171,9 +171,9 @@
     }
 
     // Reserve the required space in the buffers
-    for (const TranslatedAttribute *translated : mActiveEnabledAttributes)
+    for (const TranslatedAttribute *activeAttrib : mActiveEnabledAttributes)
     {
-        gl::Error error = reserveSpaceForAttrib(*translated, count, instances);
+        gl::Error error = reserveSpaceForAttrib(*activeAttrib, count, instances);
         if (error.isError())
         {
             return error;
@@ -181,9 +181,9 @@
     }
 
     // Perform the vertex data translations
-    for (TranslatedAttribute *translated : mActiveEnabledAttributes)
+    for (TranslatedAttribute *activeAttrib : mActiveEnabledAttributes)
     {
-        gl::Error error = storeAttribute(translated, start, count, instances);
+        gl::Error error = storeAttribute(activeAttrib, start, count, instances);
 
         if (error.isError())
         {
@@ -212,14 +212,14 @@
     // Hint to unmap all the resources
     hintUnmapAllResources(vertexAttributes);
 
-    for (const TranslatedAttribute *translated : mActiveEnabledAttributes)
+    for (const TranslatedAttribute *activeAttrib : mActiveEnabledAttributes)
     {
-        gl::Buffer *buffer = translated->attribute->buffer.get();
+        gl::Buffer *buffer = activeAttrib->attribute->buffer.get();
 
         if (buffer)
         {
             BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
-            size_t typeSize = ComputeVertexAttributeTypeSize(*translated->attribute);
+            size_t typeSize = ComputeVertexAttributeTypeSize(*activeAttrib->attribute);
             bufferD3D->promoteStaticUsage(count * typeSize);
         }
     }