From bbfea9ca4e14961ecad7bd62acc868c0f4a2adaa Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Tue, 10 Sep 2013 15:35:32 +1000
Subject: Fix variable shadowing issues.

---
 lexlib/StyleContext.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lexlib')

diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h
index 73b7b515a..12d69d8f2 100644
--- a/lexlib/StyleContext.h
+++ b/lexlib/StyleContext.h
@@ -172,11 +172,11 @@ public:
 			}
 			int diffRelative = n - offsetRelative;
 			int posNew = multiByteAccess->GetRelativePosition(posRelative, diffRelative);
-			int ch = multiByteAccess->GetCharacterAndWidth(posNew, 0);
+			int chReturn = multiByteAccess->GetCharacterAndWidth(posNew, 0);
 			posRelative = posNew;
 			currentPosLastRelative = currentPos;
 			offsetRelative = n;
-			return ch;
+			return chReturn;
 		} else {
 			// fast version for single byte encodings
 			return static_cast<unsigned char>(styler.SafeGetCharAt(currentPos + n, 0));
-- 
cgit v1.2.3