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

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
line wrap: on
line source

# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1638133340 -3600
#      Sun Nov 28 22:02:20 2021 +0100
# Node ID 2f2695e1f4b779632465782368c89ef1c7df0d91
# Parent  c3d5e17f6023c14b85d405aba8b1c76a8f54d02a
Fix compilation with Octave 8 (bug #61578).

* src/pcregexp.cc (Fpcregexp): Remove usage of `error_state`. It was
unconditionally set to 0 since about 6 years ago and will finally be removed in
Octave 8.

diff -r c3d5e17f6023 -r 2f2695e1f4b7 src/pcregexp.cc
--- a/src/pcregexp.cc	Thu Jan 09 16:50:10 2020 -0500
+++ b/src/pcregexp.cc	Sun Nov 28 22:02:20 2021 +0100
@@ -48,10 +48,6 @@
 
     std::string pattern = args(0).string_value();
     std::string input = args(1).string_value();
-    if (error_state) {
-        gripe_wrong_type_arg("pcregexp", args(0));
-        return retval;
-    }
 
     // Compile expression
     pcre *re;