Mercurial > mxe-octave

annotate src/of-strings-2-error_state.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents 5732a63f3182
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5990
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 # HG changeset patch
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 # User Markus Mützel <markus.muetzel@gmx.de>
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 # Date 1638133340 -3600
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 # Sun Nov 28 22:02:20 2021 +0100
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 # Node ID 2f2695e1f4b779632465782368c89ef1c7df0d91
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 # Parent c3d5e17f6023c14b85d405aba8b1c76a8f54d02a
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 Fix compilation with Octave 8 (bug #61578).
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 * src/pcregexp.cc (Fpcregexp): Remove usage of `error_state`. It was
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 unconditionally set to 0 since about 6 years ago and will finally be removed in
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 Octave 8.
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 diff -r c3d5e17f6023 -r 2f2695e1f4b7 src/pcregexp.cc
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/src/pcregexp.cc Thu Jan 09 16:50:10 2020 -0500
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/src/pcregexp.cc Sun Nov 28 22:02:20 2021 +0100
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -48,10 +48,6 @@
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 std::string pattern = args(0).string_value();
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 std::string input = args(1).string_value();
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - if (error_state) {
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 - gripe_wrong_type_arg("pcregexp", args(0));
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 - return retval;
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 - }
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 // Compile expression
5732a63f3182 of-strings: Fix for Octave 8 (bug #61578).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 pcre *re;