aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorZufu Liu <unknown>2017-10-15 09:05:57 +1100
committerZufu Liu <unknown>2017-10-15 09:05:57 +1100
commitdfbe85f34adf4a6f5dbc9a0ed4790d7a844c2fc3 (patch)
tree185748e5b0efff053641fae4206189bb66fc014e
parentf2cab0dd2404b5c817f4334100b6d8fa173f8602 (diff)
downloadscintilla-mirror-dfbe85f34adf4a6f5dbc9a0ed4790d7a844c2fc3.tar.gz
Bug [#1978]. Minor undefined behaviour fixed.
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--src/ViewStyle.cxx2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index f205a81e5..425de7247 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -557,6 +557,10 @@
<a href="http://sourceforge.net/p/scintilla/bugs/1968/">Bug #1968</a>.
</li>
<li>
+ Minor undefined behaviour fixed.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1978">Bug #1978</a>.
+ </li>
+ <li>
On Cocoa, improve scrolling on macOS 10.12.
<a href="http://sourceforge.net/p/scintilla/bugs/1885">Bug #1885</a>.
</li>
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx
index 70419569b..c2d5effcd 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -192,7 +192,7 @@ void ViewStyle::CalculateMarginWidthAndMask() {
}
maskDrawInText = 0;
for (int markBit = 0; markBit < 32; markBit++) {
- const int maskBit = 1 << markBit;
+ const int maskBit = 1U << markBit;
switch (markers[markBit].markType) {
case SC_MARK_EMPTY:
maskInLine &= ~maskBit;