commit c67e6e9fade44ef8938724e82db11db725e9c8e5
author Austin Kinross <aukinros@microsoft.com> Wed Jan 21 16:01:07 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Fri Jan 23 21:18:25 2015 +0000
tree db56808f85d41ea1e35e5ec76eb684ea6e91af06
parent 3b2f9f64dc6edca63479cdab750f1424824fbf5d

Fix lots of variable shadowing in ANGLE

BUG=angle:877

Change-Id: I15168ae32605b26aee08274464ffe68adb5a7e87
Reviewed-on: https://chromium-review.googlesource.com/242351
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Austin Kinross <aukinros@microsoft.com>

src/compiler/translator/StructureHLSL.cpp

diff --git a/src/compiler/translator/StructureHLSL.cpp b/src/compiler/translator/StructureHLSL.cpp
index 48929af..304949b 100644
--- a/src/compiler/translator/StructureHLSL.cpp
+++ b/src/compiler/translator/StructureHLSL.cpp
@@ -274,9 +274,9 @@
 
     for (unsigned int parameter = 0; parameter < ctorParameters.size(); parameter++)
     {
-        const TType &type = ctorParameters[parameter];
+        const TType &paramType = ctorParameters[parameter];
 
-        constructor += TypeString(type) + " x" + str(parameter) + ArrayString(type);
+        constructor += TypeString(paramType) + " x" + str(parameter) + ArrayString(paramType);
 
         if (parameter < ctorParameters.size() - 1)
         {