diff options
author | Neil <nyamatongwe@gmail.com> | 2018-04-26 20:01:00 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2018-04-26 20:01:00 +1000 |
commit | 2e4968545413d64429189697f17c6f81f1223d76 (patch) | |
tree | ede096874153f0d3a0ad3b46762c1163cac81214 /src | |
parent | f2b280565298dc86af2885ad78d331ba37602bfc (diff) | |
download | scintilla-mirror-2e4968545413d64429189697f17c6f81f1223d76.tar.gz |
Backport: Change type to avoid casts.
Backport of changeset 6747:6f6113f848b1.
Diffstat (limited to 'src')
-rw-r--r-- | src/ViewStyle.cxx | 4 | ||||
-rw-r--r-- | src/ViewStyle.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ViewStyle.cxx b/src/ViewStyle.cxx index f8653605b..d57ad48bd 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -377,10 +377,10 @@ void ViewStyle::ReleaseAllExtendedStyles() { } int ViewStyle::AllocateExtendedStyles(int numberStyles) { - const int startRange = static_cast<int>(nextExtendedStyle); + const int startRange = nextExtendedStyle; nextExtendedStyle += numberStyles; EnsureStyle(nextExtendedStyle); - for (size_t i=startRange; i<nextExtendedStyle; i++) { + for (int i=startRange; i<nextExtendedStyle; i++) { styles[i].ClearTo(styles[STYLE_DEFAULT]); } return startRange; diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 4348e3eaa..c2e052e03 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -91,7 +91,7 @@ class ViewStyle { FontMap fonts; public: std::vector<Style> styles; - size_t nextExtendedStyle; + int nextExtendedStyle; std::vector<LineMarker> markers; int largestMarkerHeight; std::vector<Indicator> indicators; |