Mercurial > octave

diff libinterp/octave-value/ov-builtin.h @ 29466:7c8a70e4daad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use "m_" prefix for class members in a few more classes * ov-builtin.h, ov-builtin.cc, ov-class.h, ov-class.cc, ov-classdef.h, ov-classdef.cc, ov-usr-fcn.h, ov-usr-fcn.cc: Use "m_" prefix for class data members.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Mar 2021 15:35:05 -0400
parents 0a5b15007766
children f254c302bb9c
line wrap: on
line diff
--- a/libinterp/octave-value/ov-builtin.h	Sat Mar 27 09:26:12 2021 +0100
+++ b/libinterp/octave-value/ov-builtin.h	Sun Mar 28 15:35:05 2021 -0400
@@ -53,8 +53,9 @@
 {
 public:
 
-  octave_builtin (void) : octave_function (), f (nullptr), m (nullptr),
-                          file (), jtype (nullptr)
+  octave_builtin (void)
+    : octave_function (), m_fcn (nullptr), m_meth (nullptr), m_file (),
+      m_jtype (nullptr)
   { }
 
   typedef octave_value_list (*meth) (octave::interpreter&,
@@ -64,22 +65,26 @@
 
   octave_builtin (fcn ff, const std::string& nm = "",
                   const std::string& ds = "")
-    : octave_function (nm, ds), f (ff), m (nullptr), file (), jtype (nullptr)
+    : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file (),
+      m_jtype (nullptr)
   { }
 
   octave_builtin (meth mm, const std::string& nm = "",
                   const std::string& ds = "")
-    : octave_function (nm, ds), f (nullptr), m (mm), file (), jtype (nullptr)
+    : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file (),
+      m_jtype (nullptr)
   { }
 
   octave_builtin (fcn ff, const std::string& nm, const std::string& fnm,
                   const std::string& ds)
-    : octave_function (nm, ds), f (ff), m (nullptr), file (fnm), jtype (nullptr)
+    : octave_function (nm, ds), m_fcn (ff), m_meth (nullptr), m_file (fnm),
+      m_jtype (nullptr)
   { }
 
   octave_builtin (meth mm, const std::string& nm, const std::string& fnm,
                   const std::string& ds)
-    : octave_function (nm, ds), f (nullptr), m (mm), file (fnm), jtype (nullptr)
+    : octave_function (nm, ds), m_fcn (nullptr), m_meth (mm), m_file (fnm),
+      m_jtype (nullptr)
   { }
 
   // No copying!
@@ -90,7 +95,7 @@
 
   ~octave_builtin (void) = default;
 
-  std::string src_file_name (void) const { return file; }
+  std::string src_file_name (void) const { return m_file; }
 
   octave_function * function_value (bool = false) { return this; }
 
@@ -115,17 +120,17 @@
 protected:
 
   // A pointer to the actual function.
-  fcn f;
-  meth m;
+  fcn m_fcn;
+  meth m_meth;
 
   // The name of the file where this function was defined.
-  std::string file;
+  std::string m_file;
 
   // The types this function has been declared to handle (if any).
-  std::set<std::string> dispatch_classes;
+  std::set<std::string> m_dispatch_classes;
 
   // A pointer to the jit type that represents the function.
-  octave::jit_type *jtype;
+  octave::jit_type *m_jtype;
 
 private: