Mercurial > mxe-octave

changeset 7132:91a699a47331

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-image: Add patch for missing include of <cassert>. * src/of-image-1-cassert.patch: Add new file. * dist-files.mk: Add new file to list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 28 Mar 2024 19:20:14 +0100
parents 01a3db7f1f49
children 1661d85f0497
files dist-files.mk src/of-image-1-cassert.patch
diffstat 2 files changed, 24 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Mar 28 15:37:09 2024 +0100
+++ b/dist-files.mk	Thu Mar 28 19:20:14 2024 +0100
@@ -484,6 +484,7 @@
   of-geometry.mk \
   of-gsl-1-cross-fixes.patch \
   of-gsl.mk \
+  of-image-1-cassert.patch \ 
   of-image.mk \
   of-instrument-control.mk \
   of-interval-1-cross-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-image-1-cassert.patch	Thu Mar 28 19:20:14 2024 +0100
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1711637836 -3600
+#      Thu Mar 28 15:57:16 2024 +0100
+# Node ID d00233197c4c4b90b31bc5adc5241deb101f8693
+# Parent  7994f988b7b8900368a6575ac1b9f437cf860566
+strel.cc: Include <cassert> in file that uses "assert" (bug #65525).
+
+* src/strel.cc: The header <cassert> happened to be included via some headers
+from Octave before. That is no longer the case for Octave 10. Include the
+header directly in a file that requires it.
+
+diff -r 7994f988b7b8 -r d00233197c4c src/strel.cc
+--- a/src/strel.cc	Sat Jan 20 14:15:28 2024 +0000
++++ b/src/strel.cc	Thu Mar 28 15:57:16 2024 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include "strel.h"
+ 
++#include <cassert>
+ #include <vector>
+ 
+ #include <octave/oct.h>