commit 3ae6465f03660f5d93a7ee01715b54948caa8858
author Austin Kinross <aukinros@microsoft.com> Mon Jan 26 15:51:39 2015 -0800
committer Geoff Lang <geofflang@chromium.org> Tue Jan 27 10:43:24 2015 +0000
tree 6e2d537960202bc081fac4ac5eed79c8ae3e285b
parent 1be8870bd29ba8d848f65031104cef3b8c8b3374

Fix lots of variable shadowing in ANGLE

BUG=angle:877

Change-Id: I3df0fffb19f5ecbe439fbc2a8d6d239a5dc6b638
Reviewed-on: https://chromium-review.googlesource.com/243334
Tested-by: Austin Kinross <aukinros@microsoft.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index d7d98b5..5eac0c5 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -423,25 +423,25 @@
     nameMap.clear();
 }
 
-bool TCompiler::detectCallDepth(TIntermNode* root, TInfoSink& infoSink, bool limitCallStackDepth)
+bool TCompiler::detectCallDepth(TIntermNode* inputRoot, TInfoSink& inputInfoSink, bool limitCallStackDepth)
 {
-    DetectCallDepth detect(infoSink, limitCallStackDepth, maxCallStackDepth);
-    root->traverse(&detect);
+    DetectCallDepth detect(inputInfoSink, limitCallStackDepth, maxCallStackDepth);
+    inputRoot->traverse(&detect);
     switch (detect.detectCallDepth())
     {
       case DetectCallDepth::kErrorNone:
         return true;
       case DetectCallDepth::kErrorMissingMain:
-        infoSink.info.prefix(EPrefixError);
-        infoSink.info << "Missing main()";
+        inputInfoSink.info.prefix(EPrefixError);
+        inputInfoSink.info << "Missing main()";
         return false;
       case DetectCallDepth::kErrorRecursion:
-        infoSink.info.prefix(EPrefixError);
-        infoSink.info << "Function recursion detected";
+        inputInfoSink.info.prefix(EPrefixError);
+        inputInfoSink.info << "Function recursion detected";
         return false;
       case DetectCallDepth::kErrorMaxDepthExceeded:
-        infoSink.info.prefix(EPrefixError);
-        infoSink.info << "Function call stack too deep";
+        inputInfoSink.info.prefix(EPrefixError);
+        inputInfoSink.info << "Function call stack too deep";
         return false;
       default:
         UNREACHABLE();