From 58471e908a3b74b27379bb19a13d62cd8d4476b0 Mon Sep 17 00:00:00 2001 From: Joe Mueller Date: Thu, 30 Jul 2015 14:35:17 +1000 Subject: Use Sci_Position / Sci_PositionU for variables in lexers that represent positions and line numbers and may be widened to 64-bits in a future release. --- lexers/LexR.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lexers/LexR.cxx') diff --git a/lexers/LexR.cxx b/lexers/LexR.cxx index 7f0442660..c72937bbb 100644 --- a/lexers/LexR.cxx +++ b/lexers/LexR.cxx @@ -150,9 +150,9 @@ static void FoldRDoc(Sci_PositionU startPos, Sci_Position length, int, WordList Accessor &styler) { bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0; bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0; - unsigned int endPos = startPos + length; + Sci_PositionU endPos = startPos + length; int visibleChars = 0; - int lineCurrent = styler.GetLine(startPos); + Sci_Position lineCurrent = styler.GetLine(startPos); int levelCurrent = SC_FOLDLEVELBASE; if (lineCurrent > 0) levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; @@ -160,7 +160,7 @@ static void FoldRDoc(Sci_PositionU startPos, Sci_Position length, int, WordList int levelNext = levelCurrent; char chNext = styler[startPos]; int styleNext = styler.StyleAt(startPos); - for (unsigned int i = startPos; i < endPos; i++) { + for (Sci_PositionU i = startPos; i < endPos; i++) { char ch = chNext; chNext = styler.SafeGetCharAt(i + 1); int style = styleNext; -- cgit v1.2.3