diff options
Diffstat (limited to 'src/scintilla_backports/6196_e4f249dbdc30.patch')
| -rw-r--r-- | src/scintilla_backports/6196_e4f249dbdc30.patch | 28 |
1 files changed, 28 insertions, 0 deletions
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 <nyamatongwe@gmail.com> +# 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<len; i++) { + positions[i] = positions_[i]; + } +- memcpy(reinterpret_cast<void *>(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<void *>(positions + len), s_, len)== 0)) { ++ (memcmp(positions + len, s_, len)== 0)) { + for (unsigned int i=0; i<len; i++) { + positions_[i] = positions[i]; + } |