Mercurial > octave

diff liboctave/Quad.cc @ 1251:97eac19837dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1995-04-11 15:58:32 by jwe]
author jwe
date Tue, 11 Apr 1995 15:58:32 +0000
parents b6360f2d4fa6
children bb67a902760b
line wrap: on
line diff
--- a/liboctave/Quad.cc	Tue Apr 11 01:07:17 1995 +0000
+++ b/liboctave/Quad.cc	Tue Apr 11 15:58:32 1995 +0000
@@ -42,16 +42,16 @@
 
 extern "C"
 {
-  int F77_FCN (dqagp) (const double (*)(double*, int*), const double*,
-		       const double*, const int*, const double*,
-		       const double*, const double*, double*, double*,
-		       int*, int*, const int*, const int*, int*, int*,
-		       double*);
+  int F77_FCN (dqagp) (const double (*)(double*, int&),
+		       const double&, const double&, const int&,
+		       const double*, const double&, const double&,
+		       double&, double&, int&, int&, const int&,
+		       const int&, int&, int*, double*);
 
-  int F77_FCN (dqagi) (const double (*)(double*, int*), const double*,
-		       const int*, const double*, const double*,
-		       double*, double*, int*, int*, const int*,
-		       const int*, int*, int*, double*);
+  int F77_FCN (dqagi) (const double (*)(double*, int&), const double&,
+		       const int&, const double&, const double&,
+		       double&, double&, int&, int&, const int&,
+		       const int&, int&, int*, double*); 
 }
 
 Quad::Quad (integrand_fcn fcn)
@@ -88,7 +88,7 @@
 }
 
 static double
-user_function (double *x, int *ierr)
+user_function (double *x, int& ierr)
 {
 #if defined (sun) && defined (__GNUC__)
   double xx = access_double (x);
@@ -101,7 +101,7 @@
   double retval = (*user_fcn) (xx);
 
   if (quad_integration_error)
-    *ierr = -1;
+    ierr = -1;
 
   return retval;
 }
@@ -175,9 +175,9 @@
   double abs_tol = absolute_tolerance ();
   double rel_tol = relative_tolerance ();
 
-  F77_FCN (dqagp) (user_function, &lower_limit, &upper_limit, &npts,
-		   points, &abs_tol, &rel_tol, &result, &abserr,
-		   &neval, &ier, &leniw, &lenw, &last, iwork, work);
+  F77_FCN (dqagp) (user_function, lower_limit, upper_limit, npts,
+		   points, abs_tol, rel_tol, result, abserr,
+		   neval, ier, leniw, lenw, last, iwork, work);
 
   delete [] iwork;
   delete [] work;
@@ -243,9 +243,9 @@
   double abs_tol = absolute_tolerance ();
   double rel_tol = relative_tolerance ();
 
-  F77_FCN (dqagi) (user_function, &bound, &inf, &abs_tol, &rel_tol,
-		   &result, &abserr, &neval, &ier, &leniw, &lenw,
-		   &last, iwork, work);
+  F77_FCN (dqagi) (user_function, bound, inf, abs_tol, rel_tol,
+		   result, abserr, neval, ier, leniw, lenw,
+		   last, iwork, work);
 
   delete [] iwork;
   delete [] work;