Mercurial > octave
diff libinterp/octave.h @ 30160:9c4e8c3bf41d
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 | 939bef0b66e0 |
children | 91c6288781ba 796f54d4ddbf |
line wrap: on
line diff
--- 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);