aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6124_4527b3c217a4.patch
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2018-03-12 18:20:24 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2018-03-12 18:20:24 -0400
commitec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch)
tree3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6124_4527b3c217a4.patch
parentf82726891b4cd2f323ce882e5aa6d71227dda887 (diff)
downloadtextadept-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/6124_4527b3c217a4.patch')
-rw-r--r--src/scintilla_backports/6124_4527b3c217a4.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/src/scintilla_backports/6124_4527b3c217a4.patch b/src/scintilla_backports/6124_4527b3c217a4.patch
deleted file mode 100644
index f439b37e..00000000
--- a/src/scintilla_backports/6124_4527b3c217a4.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Neil <nyamatongwe@gmail.com>
-# Date 1488955608 -39600
-# Node ID 4527b3c217a44e45e4714c2a302f124df7109b2f
-# Parent 0fd4b41bcec612df9a3e8204399d0acde55194ce
-Fix warnings from Visual Studio 2017.
-
-diff -r 0fd4b41bcec6 -r 4527b3c217a4 src/PositionCache.cxx
---- a/src/PositionCache.cxx Wed Mar 08 16:36:39 2017 +1100
-+++ b/src/PositionCache.cxx Wed Mar 08 17:46:48 2017 +1100
-@@ -392,7 +392,7 @@
- }
-
- SpecialRepresentations::SpecialRepresentations() {
-- std::fill(startByteHasReprs, startByteHasReprs+0x100, 0);
-+ std::fill(startByteHasReprs, startByteHasReprs+0x100, static_cast<short>(0));
- }
-
- void SpecialRepresentations::SetRepresentation(const char *charBytes, const char *value) {
-@@ -433,7 +433,7 @@
-
- void SpecialRepresentations::Clear() {
- mapReprs.clear();
-- std::fill(startByteHasReprs, startByteHasReprs+0x100, 0);
-+ std::fill(startByteHasReprs, startByteHasReprs+0x100, static_cast<short>(0));
- }
-
- void BreakFinder::Insert(int val) {
-diff -r 0fd4b41bcec6 -r 4527b3c217a4 src/RESearch.cxx
---- a/src/RESearch.cxx Wed Mar 08 16:36:39 2017 +1100
-+++ b/src/RESearch.cxx Wed Mar 08 17:46:48 2017 +1100
-@@ -256,9 +256,9 @@
- charClass = charClassTable;
- sta = NOP; /* status of lastpat */
- bol = 0;
-- std::fill(bittab, bittab + BITBLK, 0);
-+ std::fill(bittab, bittab + BITBLK, static_cast<unsigned char>(0));
- std::fill(tagstk, tagstk + MAXTAG, 0);
-- std::fill(nfa, nfa + MAXNFA, 0);
-+ std::fill(nfa, nfa + MAXNFA, '\0');
- Clear();
- }
-