aboutsummaryrefslogtreecommitdiffhomepage
path: root/lexlib/StyleContext.h
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2013-09-10 15:35:32 +1000
committernyamatongwe <nyamatongwe@gmail.com>2013-09-10 15:35:32 +1000
commitbbfea9ca4e14961ecad7bd62acc868c0f4a2adaa (patch)
tree4286e0bcc319d86a3d355ee79688503ef1bb4db6 /lexlib/StyleContext.h
parent8ba6c4c8e180b7506d1cb4f012aac253b3da6750 (diff)
downloadscintilla-mirror-bbfea9ca4e14961ecad7bd62acc868c0f4a2adaa.tar.gz
Fix variable shadowing issues.
Diffstat (limited to 'lexlib/StyleContext.h')
-rw-r--r--lexlib/StyleContext.h4
1 files changed, 2 insertions, 2 deletions
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));