diff src/of-strings-1-fixes.patch @ 4653:00e61c4a5657

fixes for package build errors due to API changes
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 12:12:44 -0400
parents 76247f439f51
children 5732a63f3182
line wrap: on
line diff
--- a/src/of-strings-1-fixes.patch	Mon Apr 09 07:11:54 2018 -0400
+++ b/src/of-strings-1-fixes.patch	Mon Apr 09 12:12:44 2018 -0400
@@ -14,3 +14,23 @@
  
  pcregexp.oct: %.oct: %.cc
  	$(MKOCTFILE) $(PCRE_SWITCHES) -o $@ $<
+diff -uNr a/src/pcregexp.cc b/src/pcregexp.cc
+--- a/src/pcregexp.cc	2015-06-06 17:40:45.000000000 -0400
++++ b/src/pcregexp.cc	2018-04-09 15:01:27.359869527 -0400
+@@ -22,6 +22,7 @@
+ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include <octave/oct.h>
++#include <octave/errwarn.h>
+ #include <pcre.h>
+ #include <iostream>
+ #include <vector>
+@@ -49,7 +50,7 @@
+     std::string pattern = args(0).string_value();
+     std::string input = args(1).string_value();
+     if (error_state) {
+-        gripe_wrong_type_arg("pcregexp", args(0));
++        err_wrong_type_arg("pcregexp", args(0));
+         return retval;
+     }
+