Mercurial > octave

diff libinterp/octave.cc @ 30160:9c4e8c3bf41d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "s_" prefix for static member variables in class application. * octave.cc, octave.h: Use "s_" prefix for static member variables in class application.
author Rik <rik@octave.org>
date Sun, 12 Sep 2021 20:31:03 -0700
parents 7d6709900da7
children 6b17822663f8 796f54d4ddbf
line wrap: on
line diff
--- a/libinterp/octave.cc	Sun Sep 12 20:29:53 2021 -0700
+++ b/libinterp/octave.cc	Sun Sep 12 20:31:03 2021 -0700
@@ -273,7 +273,7 @@
     return m;
   }
 
-  application *application::instance = nullptr;
+  application *application::s_instance = nullptr;
 
   application::application (int argc, char **argv)
     : m_options (argc, argv)
@@ -324,15 +324,15 @@
 
   bool application::forced_interactive (void)
   {
-    return instance ? instance->m_options.forced_interactive () : false;
+    return s_instance ? s_instance->m_options.forced_interactive () : false;
   }
 
   // Provided for convenience.  Will be removed once we eliminate the
   // old terminal widget.
   bool application::experimental_terminal_widget (void) const
   {
-    return (instance
-            ? instance->m_options.experimental_terminal_widget () : false);
+    return (s_instance
+            ? s_instance->m_options.experimental_terminal_widget () : false);
   }
 
   bool application::interpreter_initialized (void)
@@ -366,11 +366,11 @@
 
   void application::init (void)
   {
-    if (instance)
+    if (s_instance)
       throw std::runtime_error
         ("only one Octave application object may be active");
 
-    instance = this;
+    s_instance = this;
 
     string_vector all_args = m_options.all_args ();