Mercurial > octave

changeset 22912:1b5e7f2bd38d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* __ode15__.cc: Avoid NULL in C++ code.
author John W. Eaton <jwe@octave.org>
date Fri, 16 Dec 2016 11:49:46 -0500
parents 82551783527f
children 69342e4f0dcf
files libinterp/dldfcn/__ode15__.cc
diffstat 1 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/dldfcn/__ode15__.cc	Fri Dec 16 11:49:05 2016 -0500
+++ b/libinterp/dldfcn/__ode15__.cc	Fri Dec 16 11:49:46 2016 -0500
@@ -81,9 +81,9 @@
     //Default
     IDA (void)
       : t0 (0.0), y0 (), yp0 (), havejac (false), havejacfun (false),
-        havejacsparse (false), mem (NULL), num (), ida_fun (NULL),
-        ida_jac (NULL), dfdy (NULL), dfdyp (NULL), spdfdy (NULL),
-        spdfdyp (NULL), fun (0), jacfun (NULL), jacspfun (0),
+        havejacsparse (false), mem (0), num (), ida_fun (0),
+        ida_jac (0), dfdy (0), dfdyp (0), spdfdy (0),
+        spdfdyp (0), fun (0), jacfun (0), jacspfun (0),
         jacdcell (0), jacspcell (0)
     { };
 
@@ -91,9 +91,9 @@
     IDA (realtype t, ColumnVector y, ColumnVector yp,
          octave_function *ida_fcn, DAERHSFuncIDA daefun)
       : t0 (t), y0 (y), yp0 (yp), havejac (false), havejacfun (false),
-        havejacsparse (false), mem (NULL), num (), ida_fun (ida_fcn),
-        ida_jac (NULL), dfdy (NULL), dfdyp (NULL), spdfdy (NULL),
-        spdfdyp (NULL), fun (daefun), jacfun (NULL), jacspfun (0),
+        havejacsparse (false), mem (0), num (), ida_fun (ida_fcn),
+        ida_jac (0), dfdy (0), dfdyp (0), spdfdy (0),
+        spdfdyp (0), fun (daefun), jacfun (0), jacspfun (0),
         jacdcell (0), jacspcell (0)
     { };
 
@@ -1192,7 +1192,7 @@
     bool haverefine =
       (refine > 1);
 
-    octave_function *output_fcn = NULL;
+    octave_function *output_fcn = 0;
     ColumnVector outputsel;
 
     // OutputFcn
@@ -1209,7 +1209,7 @@
     if (haveoutputsel)
       outputsel = options.getfield("OutputSel").vector_value ();
 
-    octave_function *event_fcn = NULL;
+    octave_function *event_fcn = 0;
 
     // Events
     bool haveeventfunction =
@@ -1256,7 +1256,7 @@
     print_usage ();
 
   // Check odefun
-  octave_function *ida_fcn = NULL;
+  octave_function *ida_fcn = 0;
 
   octave_value f_arg = args(0);