Mercurial > mxe-octave

changeset 7134:ebdff9919577

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-nurbs: Add patch for missing include of <cassert>. * src/of-nurbs-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:30:18 +0100
parents 1661d85f0497
children 51670dbb688f
files dist-files.mk src/of-nurbs-1-cassert.patch
diffstat 2 files changed, 49 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Mar 28 19:21:22 2024 +0100
+++ b/dist-files.mk	Thu Mar 28 19:30:18 2024 +0100
@@ -503,6 +503,7 @@
   of-miscellaneous.mk \
   of-nan.mk \
   of-netcdf.mk \
+  of-nurbs-1-cassert.patch \
   of-nurbs.mk \
   of-ocs-1-cross-fixes.patch \
   of-ocs-2-dev-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-nurbs-1-cassert.patch	Thu Mar 28 19:30:18 2024 +0100
@@ -0,0 +1,48 @@
+# HG changeset patch
+# User Markus Mützel <markus.muetzel@gmx.de>
+# Date 1711650467 -3600
+#      Thu Mar 28 19:27:47 2024 +0100
+# Node ID 5a45916ec64f6e822283a2b57aa491d29eee531f
+# Parent  7eb621c830ef0d8826474248fa27e2bb8bc7089e
+Include <cassert> in files that use "assert".
+
+* src/low_level_functions.cc, src/nrbsurfderiveval.cc, src/tbasisfun.cc: The
+header <cassert> happened to be include via some headers from Octave before.
+That is no longer the case for Octave 10. Include the header directly in files
+that require it.
+
+diff -r 7eb621c830ef -r 5a45916ec64f src/low_level_functions.cc
+--- a/src/low_level_functions.cc	Mon May 15 15:43:05 2023 +0200
++++ b/src/low_level_functions.cc	Thu Mar 28 19:27:47 2024 +0100
+@@ -17,6 +17,8 @@
+ */
+ 
+ 
++#include <cassert>
++
+ #include <octave/oct.h>
+ #include "low_level_functions.h"
+ #include <iostream>
+diff -r 7eb621c830ef -r 5a45916ec64f src/nrbsurfderiveval.cc
+--- a/src/nrbsurfderiveval.cc	Mon May 15 15:43:05 2023 +0200
++++ b/src/nrbsurfderiveval.cc	Thu Mar 28 19:27:47 2024 +0100
+@@ -14,6 +14,7 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <cassert>
+ #include <iostream>
+ #include <octave/oct.h>
+ #include <octave/oct-map.h>
+diff -r 7eb621c830ef -r 5a45916ec64f src/tbasisfun.cc
+--- a/src/tbasisfun.cc	Mon May 15 15:43:05 2023 +0200
++++ b/src/tbasisfun.cc	Thu Mar 28 19:27:47 2024 +0100
+@@ -15,6 +15,8 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
++#include <cassert>
++
+ #include <octave/oct.h>
+ #include <iostream>
+