diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-01-26 18:04:38 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-01-26 18:04:38 +1100 |
| commit | 9d20aa315368dc8744fe69c23f371201b0fbbc37 (patch) | |
| tree | 5d40bebcc3d397854fa39fe0136725e773dd7596 /src/PerLine.cxx | |
| parent | 0a538f989da53970ddb3776778d87230c7929e6d (diff) | |
| download | scintilla-mirror-9d20aa315368dc8744fe69c23f371201b0fbbc37.tar.gz | |
Backport: Extend SplitVector to allow more than 2 billion elements on 64-bit systems.
Backport of changeset 6442:3e3bfe29a819.
Diffstat (limited to 'src/PerLine.cxx')
| -rw-r--r-- | src/PerLine.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/PerLine.cxx b/src/PerLine.cxx index 5a213f719..2afbf3161 100644 --- a/src/PerLine.cxx +++ b/src/PerLine.cxx @@ -135,7 +135,7 @@ int LineMarkers::MarkValue(Sci::Line line) { Sci::Line LineMarkers::MarkerNext(Sci::Line lineStart, int mask) const { if (lineStart < 0) lineStart = 0; - const Sci::Line length = markers.Length(); + const Sci::Line length = static_cast<Sci::Line>(markers.Length()); for (Sci::Line iLine = lineStart; iLine < length; iLine++) { const MarkerHandleSet *onLine = markers[iLine].get(); if (onLine && ((onLine->MarkValue() & mask) != 0)) @@ -281,7 +281,7 @@ int LineState::GetLineState(Sci::Line line) { } Sci::Line LineState::GetMaxLineState() const { - return lineStates.Length(); + return static_cast<Sci::Line>(lineStates.Length()); } static int NumberLines(const char *text) { |