changeset 30137:14214fbfa258

maint: use "m_" prefix for member variables in class java_local_ref. ov-java.cc: Use "m_" prefix for member variables in class java_local_ref.
author Rik <rik@octave.org>
date Tue, 07 Sep 2021 21:05:27 -0700
parents 598517b10959
children 2dca5c25237d
files libinterp/octave-value/ov-java.cc
diffstat 1 files changed, 27 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Tue Sep 07 16:46:38 2021 -0700
+++ b/libinterp/octave-value/ov-java.cc	Tue Sep 07 21:05:27 2021 -0700
@@ -99,11 +99,11 @@
 {
 public:
 
-  java_local_ref (JNIEnv *_env)
-    : jobj (nullptr), detached (false), env (_env) { }
-
-  java_local_ref (JNIEnv *_env, T obj)
-    : jobj (obj), detached (false), env (_env) { }
+  java_local_ref (JNIEnv *env)
+    : m_jobj (nullptr), m_detached (false), m_env (env) { }
+
+  java_local_ref (JNIEnv *env, T obj)
+    : m_jobj (obj), m_detached (false), m_env (env) { }
 
   ~java_local_ref (void) { release (); }
 
@@ -111,36 +111,37 @@
   {
     release ();
 
-    jobj = obj;
-    detached = false;
-
-    return jobj;
+    m_jobj = obj;
+    m_detached = false;
+
+    return m_jobj;
   }
 
-  operator bool () const { return (jobj != 0); }
-  operator T () { return jobj; }
-
-  void detach (void) { detached = true; }
+  operator bool () const { return (m_jobj != 0); }
+  operator T () { return m_jobj; }
+
+  void detach (void) { m_detached = true; }
+
+protected:
+
+  T m_jobj;
+  bool m_detached;
+  JNIEnv *m_env;
 
 private:
 
+  java_local_ref (void)
+    : m_jobj (0), m_detached (false), m_env (0)
+  { }
+
   void release (void)
   {
-    if (env && jobj && ! detached)
-      env->DeleteLocalRef (jobj);
-
-    jobj = nullptr;
+    if (m_env && m_jobj && ! m_detached)
+      m_env->DeleteLocalRef (m_jobj);
+
+    m_jobj = nullptr;
   }
 
-  java_local_ref (void)
-    : jobj (0), detached (false), env (0)
-  { }
-
-protected:
-
-  T jobj;
-  bool detached;
-  JNIEnv *env;
 };
 
 typedef java_local_ref<jobject> jobject_ref;