Mercurial > octave
changeset 30863:e2eed3610b7b stable
don't use mutable keyword for sys::env data members
* oct-env.h, oct-env.cc (sys::env::m_current_directory,
sys::env::m_prog_name, sys::env::m_prog_invocation_name,
sys::env::m_user_name, sys::env::m_host_name): Don't declare data
members as mutable.
(sys::env::do_polite_directory_format, sys::env::do_getcwd,
sys::env::do_get_home_directory,
sys::env::do_get_user_config_directory,
sys::env::do_get_user_data_directory, sys::env::do_get_user_name,
sys::env::do_get_host_name, sys::env::do_set_program_name): Don't
declare as const functions.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 24 Mar 2022 11:51:52 -0400 |
parents | 2f2e875d93fa |
children | 5fa3d8f0dcb3 |
files | liboctave/system/oct-env.cc liboctave/system/oct-env.h |
diffstat | 2 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/system/oct-env.cc Thu Mar 24 01:27:02 2022 -0400 +++ b/liboctave/system/oct-env.cc Thu Mar 24 11:51:52 2022 -0400 @@ -244,7 +244,7 @@ } std::string - env::do_get_user_config_directory (void) const + env::do_get_user_config_directory (void) { std::string cfg_dir; @@ -265,7 +265,7 @@ } std::string - env::do_get_user_data_directory (void) const + env::do_get_user_data_directory (void) { std::string data_dir; @@ -319,7 +319,7 @@ } void - env::do_set_program_name (const std::string& s) const + env::do_set_program_name (const std::string& s) { static bool initialized = false; @@ -353,7 +353,7 @@ // same as $HOME, then replace that with '~'. std::string - env::do_polite_directory_format (const std::string& name) const + env::do_polite_directory_format (const std::string& name) { std::string retval; @@ -516,7 +516,7 @@ // Return a string which is the current working directory. std::string - env::do_getcwd () const + env::do_getcwd (void) { if (! m_follow_symbolic_links) m_current_directory = ""; @@ -531,7 +531,7 @@ // running. std::string - env::do_get_home_directory (void) const + env::do_get_home_directory (void) { std::string hd = do_getenv ("HOME"); @@ -558,7 +558,7 @@ } std::string - env::do_get_user_name (void) const + env::do_get_user_name (void) { if (m_user_name.empty ()) { @@ -571,7 +571,7 @@ } std::string - env::do_get_host_name (void) const + env::do_get_host_name (void) { if (m_host_name.empty ()) {
--- a/liboctave/system/oct-env.h Thu Mar 24 01:27:02 2022 -0400 +++ b/liboctave/system/oct-env.h Thu Mar 24 11:51:52 2022 -0400 @@ -94,7 +94,7 @@ static bool instance_ok (void); - std::string do_polite_directory_format (const std::string& name) const; + std::string do_polite_directory_format (const std::string& name); bool do_absolute_pathname (const std::string& s) const; @@ -105,19 +105,19 @@ std::string do_make_absolute (const std::string& s, const std::string& dot_path) const; - std::string do_getcwd (void) const; + std::string do_getcwd (void); - std::string do_get_home_directory (void) const; + std::string do_get_home_directory (void); std::string do_get_temp_directory (void) const; - std::string do_get_user_config_directory (void) const; + std::string do_get_user_config_directory (void); - std::string do_get_user_data_directory (void) const; + std::string do_get_user_data_directory (void); - std::string do_get_user_name (void) const; + std::string do_get_user_name (void); - std::string do_get_host_name (void) const; + std::string do_get_host_name (void); std::string do_getenv (const std::string& name) const; @@ -125,7 +125,7 @@ bool do_chdir (const std::string& newdir); - void do_set_program_name (const std::string& s) const; + void do_set_program_name (const std::string& s); void pathname_backup (std::string& path, int n) const; @@ -148,16 +148,16 @@ bool m_verbatim_pwd; // Where are we? - mutable std::string m_current_directory; + std::string m_current_directory; // Etc. - mutable std::string m_prog_name; + std::string m_prog_name; - mutable std::string m_prog_invocation_name; + std::string m_prog_invocation_name; - mutable std::string m_user_name; + std::string m_user_name; - mutable std::string m_host_name; + std::string m_host_name; }; } }