Mercurial > octave

changeset 30101:6e5e6ce2e705

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "m_" prefix for member variables in class Quad. * Quad.cc, Quad.h: Use "m_" prefix for member variables in class Quad.
author Rik <rik@octave.org>
date Wed, 01 Sep 2021 13:08:00 -0700
parents 112e70370b71
children eb10871a5882
files liboctave/numeric/Quad.cc liboctave/numeric/Quad.h
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/Quad.cc	Wed Sep 01 21:55:57 2021 +0200
+++ b/liboctave/numeric/Quad.cc	Wed Sep 01 13:08:00 2021 -0700
@@ -108,7 +108,7 @@
   Array<double> work (dim_vector (lenw, 1));
   double *pwork = work.fortran_vec ();
 
-  user_fcn = f;
+  user_fcn = m_f;
   F77_INT last;
 
   double abs_tol = absolute_tolerance ();
@@ -153,7 +153,7 @@
   Array<double> work (dim_vector (lenw, 1));
   double *pwork = work.fortran_vec ();
 
-  user_fcn = f;
+  user_fcn = m_f;
   F77_INT last;
 
   F77_INT inf;
@@ -225,7 +225,7 @@
   Array<float> work (dim_vector (lenw, 1));
   float *pwork = work.fortran_vec ();
 
-  float_user_fcn = ff;
+  float_user_fcn = m_ff;
   F77_INT last;
 
   float abs_tol = single_precision_absolute_tolerance ();
@@ -270,7 +270,7 @@
   Array<float> work (dim_vector (lenw, 1));
   float *pwork = work.fortran_vec ();
 
-  float_user_fcn = ff;
+  float_user_fcn = m_ff;
   F77_INT last;
 
   F77_INT inf;
--- a/liboctave/numeric/Quad.h	Wed Sep 01 21:55:57 2021 +0200
+++ b/liboctave/numeric/Quad.h	Wed Sep 01 13:08:00 2021 -0700
@@ -43,10 +43,10 @@
 public:
 
   Quad (integrand_fcn fcn)
-    : Quad_options (), f (fcn), ff () { }
+    : Quad_options (), m_f (fcn), m_ff () { }
 
   Quad (float_integrand_fcn fcn)
-    : Quad_options (), f (), ff (fcn) { }
+    : Quad_options (), m_f (), m_ff (fcn) { }
 
   virtual ~Quad (void) = default;
 
@@ -110,8 +110,8 @@
 
 protected:
 
-  integrand_fcn f;
-  float_integrand_fcn ff;
+  integrand_fcn m_f;
+  float_integrand_fcn m_ff;
 };
 
 class