From c79314c9bd8efc6e521664bf4de182370c436c09 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Sat, 17 Jun 2017 18:09:23 -0400 Subject: Effectively updated to Scintilla 3.7.5 with select backports to 3.7.3. --- src/scintilla_backports/6196_e4f249dbdc30.patch | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/scintilla_backports/6196_e4f249dbdc30.patch (limited to 'src/scintilla_backports/6196_e4f249dbdc30.patch') diff --git a/src/scintilla_backports/6196_e4f249dbdc30.patch b/src/scintilla_backports/6196_e4f249dbdc30.patch new file mode 100644 index 00000000..3ca9040b --- /dev/null +++ b/src/scintilla_backports/6196_e4f249dbdc30.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# User Neil +# Date 1492586191 -36000 +# Node ID e4f249dbdc30e33291297c312042b760f825f4c0 +# Parent ba90de635fc390837399a66841392d1e87c829d5 +Drop reinterpret_cast when can implicit cast to void* or const void*. + +diff -r ba90de635fc3 -r e4f249dbdc30 src/PositionCache.cxx +--- a/src/PositionCache.cxx Wed Apr 19 15:30:08 2017 +1000 ++++ b/src/PositionCache.cxx Wed Apr 19 17:16:31 2017 +1000 +@@ -575,7 +575,7 @@ + for (unsigned int i=0; i(positions + len), s_, len); ++ memcpy(positions + len, s_, len); + } + } + +@@ -594,7 +594,7 @@ + bool PositionCacheEntry::Retrieve(unsigned int styleNumber_, const char *s_, + unsigned int len_, XYPOSITION *positions_) const { + if ((styleNumber == styleNumber_) && (len == len_) && +- (memcmp(reinterpret_cast(positions + len), s_, len)== 0)) { ++ (memcmp(positions + len, s_, len)== 0)) { + for (unsigned int i=0; i