# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1648138270 14400
# Node ID 4026b5fbc67dc49e933aac8d7a7271aea00807c3
# Parent  070d5b04a0acbe98b911d960757070c93b5c2d99# Parent  5fa3d8f0dcb3db894ebc808dfd554b562384c465
maint: Merge stable to default.

diff -r 070d5b04a0ac -r 4026b5fbc67d libinterp/octave-value/ov-dld-fcn.h
--- a/libinterp/octave-value/ov-dld-fcn.h	Thu Mar 24 01:27:40 2022 -0400
+++ b/libinterp/octave-value/ov-dld-fcn.h	Thu Mar 24 12:11:10 2022 -0400
@@ -48,7 +48,7 @@
 public:
 
   octave_dld_function (void)
-    : m_sh_lib (), m_t_checked (), m_system_fcn_file ()
+    : m_sh_lib (), m_time_checked (), m_system_fcn_file ()
   { }
 
   octave_dld_function (octave_builtin::fcn ff,
@@ -70,13 +70,13 @@
   ~octave_dld_function (void);
 
   void mark_fcn_file_up_to_date (const octave::sys::time& t)
-  { m_t_checked = t; }
+  { m_time_checked = t; }
 
   std::string fcn_file_name (void) const;
 
   octave::sys::time time_parsed (void) const;
 
-  octave::sys::time time_checked (void) const { return m_t_checked; }
+  octave::sys::time time_checked (void) const { return m_time_checked; }
 
   bool is_system_fcn_file (void) const { return m_system_fcn_file; }
 
@@ -103,7 +103,7 @@
 
   // The time the file was last checked to see if it needs to be
   // parsed again.
-  mutable octave::sys::time m_t_checked;
+  octave::sys::time m_time_checked;
 
   // True if this function came from a file that is considered to be a
   // system function.  This affects whether we check the time stamp
diff -r 070d5b04a0ac -r 4026b5fbc67d libinterp/octave-value/ov-mex-fcn.h
--- a/libinterp/octave-value/ov-mex-fcn.h	Thu Mar 24 01:27:40 2022 -0400
+++ b/libinterp/octave-value/ov-mex-fcn.h	Thu Mar 24 12:11:10 2022 -0400
@@ -114,7 +114,7 @@
 
   // The time the file was last checked to see if it needs to be
   // parsed again.
-  mutable octave::sys::time m_time_checked;
+  octave::sys::time m_time_checked;
 
   bool m_interleaved;
 
diff -r 070d5b04a0ac -r 4026b5fbc67d liboctave/system/oct-env.cc
--- a/liboctave/system/oct-env.cc	Thu Mar 24 01:27:40 2022 -0400
+++ b/liboctave/system/oct-env.cc	Thu Mar 24 12:11:10 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 ())
         {
diff -r 070d5b04a0ac -r 4026b5fbc67d liboctave/system/oct-env.h
--- a/liboctave/system/oct-env.h	Thu Mar 24 01:27:40 2022 -0400
+++ b/liboctave/system/oct-env.h	Thu Mar 24 12:11:10 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;
     };
   }
 }