Mercurial > mxe-octave

annotate src/of-ocs-6-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 f3ed506c85ad
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5989
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 From b33b618b03579438efceeda51c2d1c6eab0ddea9 Mon Sep 17 00:00:00 2001
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 Date: Sun, 28 Nov 2021 21:29:13 +0100
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 Subject: [PATCH] Fix compilation with Octave 8 (bug #61577).
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 * src/Mshichmanhodgesmosfet.cc (FMshichmanhodgesmosfet): Remove usage of
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 `error_state`. It was unconditionally set to 0 since about 6 years ago and
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 will finally be removed in Octave 8.
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 ---
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 src/Mshichmanhodgesmosfet.cc | 8 ++------
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 1 file changed, 2 insertions(+), 6 deletions(-)
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 diff --git a/src/Mshichmanhodgesmosfet.cc b/src/Mshichmanhodgesmosfet.cc
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 index 4b3e51a..1c0d7c6 100644
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 --- a/src/Mshichmanhodgesmosfet.cc
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 +++ b/src/Mshichmanhodgesmosfet.cc
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 @@ -342,10 +342,8 @@ the output structures.\n\
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 error("Mshichmanhodgesmosfet: double type value expected as time instant.\n");
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 }
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 - if (!error_state)
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 - {
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 - //FIXME: create enum of cases and use switch?
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 - if (eltype == "NMOS")
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 + //FIXME: create enum of cases and use switch?
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26 + if (eltype == "NMOS")
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 {
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 //FIXME: change parameters to a single map or Octave_map
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 /* Default n-MOS parameters*/
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 @@ -543,7 +541,5 @@ the output structures.\n\
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 else
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 error("Mshichmanhodgesmosfet: unknown element type.\n");
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 - }
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 -
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 return (retval);
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 }
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 --
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39 2.34.1.windows.1
f3ed506c85ad of-ocs: Fix for Octave 8 (bug #61568).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40