diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2017-04-07 18:10:12 -0400 |
| commit | d255bd6711955192f98bed8bf0b98872dab7fca6 (patch) | |
| tree | ad4d14573ece5e8117c9de7ae246ecf711f70680 /src/scintilla_backports/6124_4527b3c217a4.patch | |
| parent | ea8dd79d8972d8a0e23d1be50cf26e3c2ccadda7 (diff) | |
| download | textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.tar.gz textadept-d255bd6711955192f98bed8bf0b98872dab7fca6.zip | |
Effectively updated to Scintilla 3.7.4 with select backports to 3.7.3.
Scintilla 3.7.4 requires a C++11 compiler, which I do not have.
Diffstat (limited to 'src/scintilla_backports/6124_4527b3c217a4.patch')
| -rw-r--r-- | src/scintilla_backports/6124_4527b3c217a4.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/src/scintilla_backports/6124_4527b3c217a4.patch b/src/scintilla_backports/6124_4527b3c217a4.patch new file mode 100644 index 00000000..f439b37e --- /dev/null +++ b/src/scintilla_backports/6124_4527b3c217a4.patch @@ -0,0 +1,43 @@ +# 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(); + } + |