From ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 12 Mar 2018 18:20:24 -0400 Subject: 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. --- src/scintilla_backports/6161_e7ca78c6f29c.patch | 27 ------------------------- 1 file changed, 27 deletions(-) delete mode 100644 src/scintilla_backports/6161_e7ca78c6f29c.patch (limited to 'src/scintilla_backports/6161_e7ca78c6f29c.patch') diff --git a/src/scintilla_backports/6161_e7ca78c6f29c.patch b/src/scintilla_backports/6161_e7ca78c6f29c.patch deleted file mode 100644 index cd8e88d4..00000000 --- a/src/scintilla_backports/6161_e7ca78c6f29c.patch +++ /dev/null @@ -1,27 +0,0 @@ -# HG changeset patch -# User Neil -# Date 1491209937 -36000 -# Node ID e7ca78c6f29cf64c8c26e3e6ee2d63f4dbd48909 -# Parent a1a9cde519976fa12e46224d6cd57483bc4633ae -Prevent warning from MSVC Code Analysis. - -diff -r a1a9cde51997 -r e7ca78c6f29c src/Decoration.cxx ---- a/src/Decoration.cxx Sun Apr 02 08:17:38 2017 +1000 -+++ b/src/Decoration.cxx Mon Apr 03 18:58:57 2017 +1000 -@@ -89,10 +89,12 @@ - decoToDelete = root; - root = root->Next(); - } else { -- Decoration *deco=root; -- while (deco->Next() && !decoToDelete) { -- if (deco->Next() && deco->Next()->Indicator() == indicator) { -- decoToDelete = deco->Next(); -+ Decoration *deco = root; -+ while (deco && deco->Next() && !decoToDelete) { -+ // decoNext ensures no warning from MSVC Code Analysis -+ Decoration *decoNext = deco->Next(); -+ if (decoNext && deco->Next()->Indicator() == indicator) { -+ decoToDelete = decoNext; - deco->next = decoToDelete->Next(); - } else { - deco = deco->Next(); -- cgit v1.2.3