diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-12 18:20:24 -0400 |
| commit | ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch) | |
| tree | 3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6196_e4f249dbdc30.patch | |
| parent | f82726891b4cd2f323ce882e5aa6d71227dda887 (diff) | |
| download | textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.tar.gz textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.zip | |
Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm.
Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required.
Since C++11 includes regex capability, drop TRE dependency.
Diffstat (limited to 'src/scintilla_backports/6196_e4f249dbdc30.patch')
| -rw-r--r-- | src/scintilla_backports/6196_e4f249dbdc30.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/scintilla_backports/6196_e4f249dbdc30.patch b/src/scintilla_backports/6196_e4f249dbdc30.patch deleted file mode 100644 index 3ca9040b..00000000 --- a/src/scintilla_backports/6196_e4f249dbdc30.patch +++ /dev/null @@ -1,28 +0,0 @@ -# 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]; - } |