aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2019-07-02 07:59:04 +1000
committerNeil <nyamatongwe@gmail.com>2019-07-02 07:59:04 +1000
commita7e454314d0db290dd98da6c3a32fef6dff95c98 (patch)
tree124cbb1579785c2a951b52b841db0c63c1d3af91
parent4330ebdf53320a0b6e0d340e997ff9cff4f8c392 (diff)
downloadscintilla-mirror-a7e454314d0db290dd98da6c3a32fef6dff95c98.tar.gz
Bug [#2115]. Backed out changeset: 74b2c724a1df as not undefined behaviour.
-rw-r--r--src/MarginView.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx
index aaa83373f..13d55730f 100644
--- a/src/MarginView.cxx
+++ b/src/MarginView.cxx
@@ -268,7 +268,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc,
const bool firstSubLine = visibleLine == firstVisibleLine;
const bool lastSubLine = visibleLine == lastVisibleLine;
- unsigned int marks = model.pdoc->GetMark(lineDoc);
+ int marks = model.pdoc->GetMark(lineDoc);
if (!firstSubLine)
marks = 0;
@@ -285,7 +285,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc,
if (levelNum < levelNextNum) {
if (model.pcs->GetExpanded(lineDoc)) {
if (levelNum == SC_FOLDLEVELBASE)
- marks |= 1U << SC_MARKNUM_FOLDEROPEN;
+ marks |= 1 << SC_MARKNUM_FOLDEROPEN;
else
marks |= 1 << folderOpenMid;
} else {