diff options
author | nyamatongwe <nyamatongwe@gmail.com> | 2013-09-10 15:35:32 +1000 |
---|---|---|
committer | nyamatongwe <nyamatongwe@gmail.com> | 2013-09-10 15:35:32 +1000 |
commit | 8dd25346bdaea0aa12ee83d35624d9d2c045af9a (patch) | |
tree | d0c65abb1138169d15531e10f98d7f21baac280b /lexlib/StyleContext.h | |
parent | a1edd2b133bf3ae4d263cea2f46aacb4b51fccb5 (diff) | |
download | scintilla-mirror-8dd25346bdaea0aa12ee83d35624d9d2c045af9a.tar.gz |
Fix variable shadowing issues.
Diffstat (limited to 'lexlib/StyleContext.h')
-rw-r--r-- | lexlib/StyleContext.h | 4 |
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)); |