aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/CellBuffer.cxx
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-01-26 18:04:38 +1100
committerNeil <nyamatongwe@gmail.com>2018-01-26 18:04:38 +1100
commit9d20aa315368dc8744fe69c23f371201b0fbbc37 (patch)
tree5d40bebcc3d397854fa39fe0136725e773dd7596 /src/CellBuffer.cxx
parent0a538f989da53970ddb3776778d87230c7929e6d (diff)
downloadscintilla-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/CellBuffer.cxx')
-rw-r--r--src/CellBuffer.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CellBuffer.cxx b/src/CellBuffer.cxx
index e87c5c305..1884a497a 100644
--- a/src/CellBuffer.cxx
+++ b/src/CellBuffer.cxx
@@ -394,7 +394,7 @@ const char *CellBuffer::RangePointer(Sci::Position position, Sci::Position range
}
Sci::Position CellBuffer::GapPosition() const {
- return substance.GapPosition();
+ return static_cast<Sci::Position>(substance.GapPosition());
}
// The char* returned is to an allocation owned by the undo history
@@ -457,7 +457,7 @@ const char *CellBuffer::DeleteChars(Sci::Position position, Sci::Position delete
}
Sci::Position CellBuffer::Length() const {
- return substance.Length();
+ return static_cast<Sci::Position>(substance.Length());
}
void CellBuffer::Allocate(Sci::Position newSize) {