# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1648099660 14400
# Node ID 070d5b04a0acbe98b911d960757070c93b5c2d99
# Parent  fc045a84cb33c3b323c36a039c6fc5b2a9558588# Parent  2f2e875d93fab5279c8760d504b16e8993e1eb76
maint: Merge stable to default.

diff -r fc045a84cb33 -r 070d5b04a0ac libinterp/corefcn/load-path.cc
--- a/libinterp/corefcn/load-path.cc	Wed Mar 23 18:28:24 2022 +0100
+++ b/libinterp/corefcn/load-path.cc	Thu Mar 24 01:27:40 2022 -0400
@@ -454,7 +454,7 @@
   }
 
   void
-  load_path::update (void) const
+  load_path::update (void)
   {
     // I don't see a better way to do this because we need to
     // preserve the correct directory ordering for new files that
@@ -1287,7 +1287,7 @@
 
   void
   load_path::add (const dir_info& di, bool at_end,
-                  const std::string& pname, bool updating) const
+                  const std::string& pname, bool updating)
   {
     package_info& l = get_package (pname);
 
diff -r fc045a84cb33 -r 070d5b04a0ac libinterp/corefcn/load-path.h
--- a/libinterp/corefcn/load-path.h	Wed Mar 23 18:28:24 2022 +0100
+++ b/libinterp/corefcn/load-path.h	Thu Mar 24 01:27:40 2022 -0400
@@ -69,7 +69,7 @@
 
     bool remove (const std::string& dir);
 
-    void update (void) const;
+    void update (void);
 
     bool contains_canonical (const std::string& dir_name) const;
 
@@ -536,11 +536,11 @@
     void add (const std::string& dir, bool at_end, bool warn);
 
     void add (const dir_info& di, bool at_end, const std::string& pname = "",
-              bool updating = false) const;
+              bool updating = false);
 
     bool is_package (const std::string& name) const;
 
-    package_info& get_package (const std::string& name) const
+    package_info& get_package (const std::string& name)
     {
       if (! name.empty () && is_package (name))
         {
@@ -568,13 +568,13 @@
 
     interpreter& m_interpreter;
 
-    mutable package_map_type m_package_map;
+    package_map_type m_package_map;
 
-    mutable package_info m_top_level_package;
+    package_info m_top_level_package;
 
-    mutable dir_info_list_type m_dir_info_list;
+    dir_info_list_type m_dir_info_list;
 
-    mutable std::set<std::string> m_init_dirs;
+    std::set<std::string> m_init_dirs;
 
     std::string m_command_line_path;