# HG changeset patch # User Rik # Date 1630354951 25200 # Node ID 1788b9f6db6a85ab7c3359b3f8f9a4553e3b82e8 # Parent 5ea53078eb8b26db40e1e0279a5ef91e3bd4c0aa maint: use "m_" prefix for member variables in file 'Quad.h'. * Quad.cc, Quad.h: Use "m_" prefix for member variables in file 'Quad.h'. diff -r 5ea53078eb8b -r 1788b9f6db6a liboctave/numeric/Quad.cc --- a/liboctave/numeric/Quad.cc Mon Aug 30 12:13:27 2021 -0700 +++ b/liboctave/numeric/Quad.cc Mon Aug 30 13:22:31 2021 -0700 @@ -96,8 +96,8 @@ DefQuad::do_integrate (octave_idx_type& ier, octave_idx_type& neval, double& abserr) { - F77_INT npts = octave::to_f77_int (singularities.numel () + 2); - double *points = singularities.fortran_vec (); + F77_INT npts = octave::to_f77_int (m_singularities.numel () + 2); + double *points = m_singularities.fortran_vec (); double result = 0.0; F77_INT leniw = 183*npts - 122; @@ -122,7 +122,7 @@ F77_INT xneval, xier; - F77_XFCN (dqagp, DQAGP, (user_function, lower_limit, upper_limit, + F77_XFCN (dqagp, DQAGP, (user_function, m_lower_limit, m_upper_limit, npts, points, abs_tol, rel_tol, result, abserr, xneval, xier, leniw, lenw, last, piwork, pwork)); @@ -157,7 +157,7 @@ F77_INT last; F77_INT inf; - switch (type) + switch (m_type) { case bound_to_inf: inf = 1; @@ -187,7 +187,7 @@ F77_INT xneval, xier; - F77_XFCN (dqagi, DQAGI, (user_function, bound, inf, abs_tol, rel_tol, + F77_XFCN (dqagi, DQAGI, (user_function, m_bound, inf, abs_tol, rel_tol, result, abserr, xneval, xier, leniw, lenw, last, piwork, pwork)); @@ -213,8 +213,8 @@ FloatDefQuad::do_integrate (octave_idx_type& ier, octave_idx_type& neval, float& abserr) { - F77_INT npts = octave::to_f77_int (singularities.numel () + 2); - float *points = singularities.fortran_vec (); + F77_INT npts = octave::to_f77_int (m_singularities.numel () + 2); + float *points = m_singularities.fortran_vec (); float result = 0.0; F77_INT leniw = 183*npts - 122; @@ -239,7 +239,7 @@ F77_INT xneval, xier; - F77_XFCN (qagp, QAGP, (float_user_function, lower_limit, upper_limit, + F77_XFCN (qagp, QAGP, (float_user_function, m_lower_limit, m_upper_limit, npts, points, abs_tol, rel_tol, result, abserr, xneval, xier, leniw, lenw, last, piwork, pwork)); @@ -274,7 +274,7 @@ F77_INT last; F77_INT inf; - switch (type) + switch (m_type) { case bound_to_inf: inf = 1; @@ -304,7 +304,7 @@ F77_INT xneval, xier; - F77_XFCN (qagi, QAGI, (float_user_function, bound, inf, abs_tol, rel_tol, + F77_XFCN (qagi, QAGI, (float_user_function, m_bound, inf, abs_tol, rel_tol, result, abserr, xneval, xier, leniw, lenw, last, piwork, pwork)); diff -r 5ea53078eb8b -r 1788b9f6db6a liboctave/numeric/Quad.h --- a/liboctave/numeric/Quad.h Mon Aug 30 12:13:27 2021 -0700 +++ b/liboctave/numeric/Quad.h Mon Aug 30 13:22:31 2021 -0700 @@ -121,19 +121,21 @@ public: DefQuad (integrand_fcn fcn) - : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { } + : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities () + { } DefQuad (integrand_fcn fcn, double ll, double ul) - : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities () { } + : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities () + { } DefQuad (integrand_fcn fcn, double ll, double ul, const ColumnVector& sing) - : Quad (fcn), lower_limit (ll), upper_limit (ul), - singularities (sing) { } + : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), + m_singularities (sing) { } DefQuad (integrand_fcn fcn, const ColumnVector& sing) - : Quad (fcn), lower_limit (0.0), upper_limit (1.0), - singularities (sing) { } + : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), + m_singularities (sing) { } ~DefQuad (void) = default; @@ -145,10 +147,10 @@ private: - double lower_limit; - double upper_limit; + double m_lower_limit; + double m_upper_limit; - ColumnVector singularities; + ColumnVector m_singularities; }; class @@ -160,10 +162,10 @@ enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; IndefQuad (integrand_fcn fcn) - : Quad (fcn), bound (0.0), type (bound_to_inf) { } + : Quad (fcn), m_bound (0.0), m_type (bound_to_inf) { } IndefQuad (integrand_fcn fcn, double b, IntegralType t) - : Quad (fcn), bound (b), type (t) { } + : Quad (fcn), m_bound (b), m_type (t) { } ~IndefQuad (void) = default; @@ -175,8 +177,8 @@ private: - double bound; - IntegralType type; + double m_bound; + IntegralType m_type; }; class @@ -186,19 +188,21 @@ public: FloatDefQuad (float_integrand_fcn fcn) - : Quad (fcn), lower_limit (0.0), upper_limit (1.0), singularities () { } + : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), m_singularities () + { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul) - : Quad (fcn), lower_limit (ll), upper_limit (ul), singularities () { } + : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), m_singularities () + { } FloatDefQuad (float_integrand_fcn fcn, float ll, float ul, const FloatColumnVector& sing) - : Quad (fcn), lower_limit (ll), upper_limit (ul), - singularities (sing) { } + : Quad (fcn), m_lower_limit (ll), m_upper_limit (ul), + m_singularities (sing) { } FloatDefQuad (float_integrand_fcn fcn, const FloatColumnVector& sing) - : Quad (fcn), lower_limit (0.0), upper_limit (1.0), - singularities (sing) { } + : Quad (fcn), m_lower_limit (0.0), m_upper_limit (1.0), + m_singularities (sing) { } ~FloatDefQuad (void) = default; @@ -210,10 +214,10 @@ private: - float lower_limit; - float upper_limit; + float m_lower_limit; + float m_upper_limit; - FloatColumnVector singularities; + FloatColumnVector m_singularities; }; class @@ -225,10 +229,10 @@ enum IntegralType { bound_to_inf, neg_inf_to_bound, doubly_infinite }; FloatIndefQuad (float_integrand_fcn fcn) - : Quad (fcn), bound (0.0), type (bound_to_inf) { } + : Quad (fcn), m_bound (0.0), m_type (bound_to_inf) { } FloatIndefQuad (float_integrand_fcn fcn, double b, IntegralType t) - : Quad (fcn), bound (b), type (t) { } + : Quad (fcn), m_bound (b), m_type (t) { } ~FloatIndefQuad (void) = default; @@ -240,8 +244,8 @@ private: - float bound; - IntegralType type; + float m_bound; + IntegralType m_type; }; #endif