diff options
author | 2018-03-12 18:20:24 -0400 | |
---|---|---|
committer | 2018-03-12 18:20:24 -0400 | |
commit | ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch) | |
tree | 3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6174_150bdfbe2b5a.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/6174_150bdfbe2b5a.patch')
-rw-r--r-- | src/scintilla_backports/6174_150bdfbe2b5a.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/scintilla_backports/6174_150bdfbe2b5a.patch b/src/scintilla_backports/6174_150bdfbe2b5a.patch deleted file mode 100644 index fda06d5e..00000000 --- a/src/scintilla_backports/6174_150bdfbe2b5a.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Neil <nyamatongwe@gmail.com> -# Date 1491558264 -36000 -# Node ID 150bdfbe2b5a267eb53a67850d478d311ccd34b6 -# Parent c9dcde8a91d3c5d9f28ba3a7cead581ff880e818 -Remove unnecessary casts. - -diff -r c9dcde8a91d3 -r 150bdfbe2b5a src/PositionCache.cxx ---- a/src/PositionCache.cxx Fri Apr 07 18:02:19 2017 +1000 -+++ b/src/PositionCache.cxx Fri Apr 07 19:44:24 2017 +1000 -@@ -575,7 +575,7 @@ - for (unsigned int i=0; i<len; i++) { - positions[i] = positions_[i]; - } -- memcpy(reinterpret_cast<char *>(reinterpret_cast<void *>(positions + len)), s_, len); -+ memcpy(reinterpret_cast<void *>(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<char *>(reinterpret_cast<void *>(positions + len)), s_, len)== 0)) { -+ (memcmp(reinterpret_cast<void *>(positions + len), s_, len)== 0)) { - for (unsigned int i=0; i<len; i++) { - positions_[i] = positions[i]; - } |