Mercurial > octave

diff libinterp/corefcn/hook-fcn.h @ 29561:ed90a4d75f6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use shared_ptr to manage data for hook_function class * hook-fcn.h, hook-fcn.cc (class base_hook_function): Delete count data member and all uses. Use default destructor, and copy constructor. Don't declare hook_function as friend class. (class hook_function): Use shared_ptr for rep and nil_rep objects. Use default destructor, copy constructor, and assignment operator. (class hook_function_list): Use default constructor, destructor, and assignment operator.
author John W. Eaton <jwe@octave.org>
date Tue, 27 Apr 2021 13:16:01 -0400
parents 0a5b15007766
children 7513a6aa14ef
line wrap: on
line diff
--- a/libinterp/corefcn/hook-fcn.h	Tue Apr 27 11:11:54 2021 -0400
+++ b/libinterp/corefcn/hook-fcn.h	Tue Apr 27 13:16:01 2021 -0400
@@ -28,6 +28,7 @@
 
 #include "octave-config.h"
 
+#include <memory>
 #include <string>
 
 #include "ovl.h"
@@ -40,11 +41,9 @@
 {
 public:
 
-  friend class hook_function;
+  base_hook_function (void) = default;
 
-  base_hook_function (void) : count (1) { }
-
-  base_hook_function (const base_hook_function&) : count (1) { }
+  base_hook_function (const base_hook_function&) = default;
 
   virtual ~base_hook_function (void) = default;
 
@@ -53,10 +52,6 @@
   virtual bool is_valid (void) const { return false; }
 
   virtual void eval (const octave_value_list&) { }
-
-protected:
-
-  size_t count;
 };
 
 class
@@ -66,39 +61,20 @@
 
   hook_function (void)
   {
-    static base_hook_function nil_rep;
-    rep = &nil_rep;
-    rep->count++;
+    static std::shared_ptr<base_hook_function>
+      nil_rep (new base_hook_function ());
+
+    rep = nil_rep;
   }
 
   hook_function (const octave_value& f,
                  const octave_value& d = octave_value ());
 
-  ~hook_function (void)
-  {
-    if (--rep->count == 0)
-      delete rep;
-  }
-
-  hook_function (const hook_function& hf)
-    : rep (hf.rep)
-  {
-    rep->count++;
-  }
+  ~hook_function (void) = default;
 
-  hook_function& operator = (const hook_function& hf)
-  {
-    if (rep != hf.rep)
-      {
-        if (--rep->count == 0)
-          delete rep;
+  hook_function (const hook_function& hf) = default;
 
-        rep = hf.rep;
-        rep->count++;
-      }
-
-    return *this;
-  }
+  hook_function& operator = (const hook_function& hf) = default;
 
   std::string id (void) const { return rep->id (); }
 
@@ -111,7 +87,7 @@
 
 private:
 
-  base_hook_function *rep;
+  std::shared_ptr<base_hook_function> rep;
 };
 
 class
@@ -183,21 +159,13 @@
   typedef map_type::iterator iterator;
   typedef map_type::const_iterator const_iterator;
 
-  hook_function_list (void) : fcn_map () { }
+  hook_function_list (void) = default;
 
   ~hook_function_list (void) = default;
 
-  hook_function_list (const hook_function_list& lst)
-    : fcn_map (lst.fcn_map)
-  { }
+  hook_function_list (const hook_function_list& lst) = default;
 
-  hook_function_list& operator = (const hook_function_list& lst)
-  {
-    if (&lst != this)
-      fcn_map = lst.fcn_map;
-
-    return *this;
-  }
+  hook_function_list& operator = (const hook_function_list& lst) = default;
 
   bool empty (void) const { return fcn_map.empty (); }