# HG changeset patch
# User Rik <rik@octave.org>
# Date 1631503863 25200
# Node ID 9c4e8c3bf41d83e708a91b8e50ac9a0cecb5c42a
# Parent  fb174e59db0aa87c835d5b8adfa971d2da35d703
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.

diff -r fb174e59db0a -r 9c4e8c3bf41d libinterp/octave.cc
--- 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 ();
 
diff -r fb174e59db0a -r 9c4e8c3bf41d libinterp/octave.h
--- a/libinterp/octave.h	Sun Sep 12 20:29:53 2021 -0700
+++ b/libinterp/octave.h	Sun Sep 12 20:31:03 2021 -0700
@@ -292,26 +292,26 @@
     // old terminal widget.
     bool experimental_terminal_widget (void) const;
 
-    static application * app (void) { return instance; }
+    static application * app (void) { return s_instance; }
 
     static std::string program_invocation_name (void)
     {
-      return instance ? instance->m_program_invocation_name : "";
+      return s_instance ? s_instance->m_program_invocation_name : "";
     }
 
     static std::string program_name (void)
     {
-      return instance ? instance->m_program_name : "";
+      return s_instance ? s_instance->m_program_name : "";
     }
 
     static string_vector argv (void)
     {
-      return instance ? instance->m_argv : string_vector ();
+      return s_instance ? s_instance->m_argv : string_vector ();
     }
 
     static bool is_gui_running (void)
     {
-      return instance ? instance->gui_running () : false;
+      return s_instance ? s_instance->gui_running () : false;
     }
 
     // Convenience functions.
@@ -321,7 +321,7 @@
   private:
 
     // The application instance;  There should be only one.
-    static application *instance;
+    static application *s_instance;
 
     void init (void);