diff libinterp/parse-tree/pt-classdef.h @ 22869:f75d289645ec

make deleted functions public * octave-gui.h, resource-manager.h, shortcut-manager.h, base-text-renderer.h, c-file-ptr-stream.h, dynamic-ld.cc, dynamic-ld.h, event-queue.h, ft-text-renderer.cc, gl-render.cc, gl-render.h, graphics.cc, graphics.in.h, interpreter.h, mex.cc, mxarray.in.h, oct-fstrm.h, oct-iostrm.h, oct-prcstrm.h, oct-procbuf.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-link.h, pager.h, profiler.h, sighandlers.cc, symtab.h, text-renderer.h, zfstream.h, __init_fltk__.cc, ov-builtin.h, ov-dld-fcn.h, ov-fcn.h, ov-mex-fcn.h, ov-typeinfo.h, ov-usr-fcn.h, octave.h, lex.h, parse.h, pt-arg-list.h, pt-array-list.h, pt-assign.h, pt-binop.h, pt-bp.h, pt-cell.h, pt-check.h, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.h, pt-eval.h, pt-except.h, pt-exp.h, pt-fcn-handle.h, pt-funcall.h, pt-id.h, pt-idx.h, pt-jump.h, pt-loop.h, pt-mat.h, pt-misc.h, pt-pr-code.h, pt-select.h, pt-stmt.h, pt-unop.h, pt-walk.h, pt.h, token.h, Array.cc, idx-vector.h, oct-fftw.h, sparse-chol.cc, sparse-qr.cc, file-ops.h, mach-info.h, oct-env.h, action-container.h, cmd-edit.cc, cmd-edit.h, cmd-hist.h, oct-locbuf.h, oct-mutex.h, oct-shlib.cc, oct-sort.h, pathsearch.h, singleton-cleanup.h, unwind-prot.h, url-transfer.cc, url-transfer.h: Declare deleted copy constructors and assignment operators public.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2016 12:40:45 -0500
parents 87e3163f6c87
children 4e3d47dc7e25
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-classdef.h	Tue Dec 06 10:59:29 2016 -0500
+++ b/libinterp/parse-tree/pt-classdef.h	Tue Dec 06 12:40:45 2016 -0500
@@ -47,6 +47,12 @@
   tree_classdef_attribute (tree_identifier *i, bool b)
     : id (i), expr (0), neg (b) { }
 
+  // No copying!
+
+  tree_classdef_attribute (const tree_classdef_attribute&) = delete;
+
+  tree_classdef_attribute& operator = (const tree_classdef_attribute&) = delete;
+
   ~tree_classdef_attribute (void)
   {
     delete id;
@@ -66,12 +72,6 @@
   tree_identifier *id;
   tree_expression *expr;
   bool neg;
-
-  // No copying!
-
-  tree_classdef_attribute (const tree_classdef_attribute&) = delete;
-
-  tree_classdef_attribute& operator = (const tree_classdef_attribute&) = delete;
 };
 
 class tree_classdef_attribute_list : public octave::base_list<tree_classdef_attribute *>
@@ -85,17 +85,16 @@
   tree_classdef_attribute_list (const octave::base_list<tree_classdef_attribute *>& a)
     : octave::base_list<tree_classdef_attribute *> (a) { }
 
-  ~tree_classdef_attribute_list (void);
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_attribute_list (const tree_classdef_attribute_list&) = delete;
 
-  tree_classdef_attribute_list& operator = (const tree_classdef_attribute_list&) = delete;
+  tree_classdef_attribute_list&
+  operator = (const tree_classdef_attribute_list&) = delete;
+
+  ~tree_classdef_attribute_list (void);
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_superclass
@@ -105,6 +104,13 @@
   tree_classdef_superclass (const std::string& cname)
     : cls_name (cname) { }
 
+  // No copying!
+
+  tree_classdef_superclass (const tree_classdef_superclass&) = delete;
+
+  tree_classdef_superclass&
+  operator = (const tree_classdef_superclass&) = delete;
+
   ~tree_classdef_superclass (void) = default;
 
   std::string class_name (void) { return cls_name; }
@@ -114,12 +120,6 @@
 private:
 
   std::string cls_name;
-
-  // No copying!
-
-  tree_classdef_superclass (const tree_classdef_superclass&) = delete;
-
-  tree_classdef_superclass& operator = (const tree_classdef_superclass&) = delete;
 };
 
 class tree_classdef_superclass_list : public octave::base_list<tree_classdef_superclass *>
@@ -133,17 +133,16 @@
   tree_classdef_superclass_list (const octave::base_list<tree_classdef_superclass *>& a)
     : octave::base_list<tree_classdef_superclass *> (a) { }
 
-  ~tree_classdef_superclass_list (void);
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_superclass_list (const tree_classdef_superclass_list&) = delete;
 
-  tree_classdef_superclass_list& operator = (const tree_classdef_superclass_list&) = delete;
+  tree_classdef_superclass_list&
+  operator = (const tree_classdef_superclass_list&) = delete;
+
+  ~tree_classdef_superclass_list (void);
+
+  void accept (tree_walker&);
 };
 
 template <typename T>
@@ -159,6 +158,12 @@
       lead_comm (lc), trail_comm (tc)
   { }
 
+  // No copying!
+
+  tree_classdef_element (const tree_classdef_element&) = delete;
+
+  tree_classdef_element& operator = (const tree_classdef_element&) = delete;
+
   ~tree_classdef_element (void)
   {
     delete attr_list;
@@ -190,12 +195,6 @@
 
   // Comment preceding END token.
   octave_comment_list *trail_comm;
-
-  // No copying!
-
-  tree_classdef_element (const tree_classdef_element&) = delete;
-
-  tree_classdef_element& operator = (const tree_classdef_element&) = delete;
 };
 
 class tree_classdef_property
@@ -205,6 +204,12 @@
   tree_classdef_property (tree_identifier *i = 0, tree_expression *e = 0)
     : id (i), expr (e) { }
 
+  // No copying!
+
+  tree_classdef_property (const tree_classdef_property&) = delete;
+
+  tree_classdef_property& operator = (const tree_classdef_property&) = delete;
+
   ~tree_classdef_property (void)
   {
     delete id;
@@ -221,12 +226,6 @@
 
   tree_identifier *id;
   tree_expression *expr;
-
-  // No copying!
-
-  tree_classdef_property (const tree_classdef_property&) = delete;
-
-  tree_classdef_property& operator = (const tree_classdef_property&) = delete;
 };
 
 class tree_classdef_property_list : public octave::base_list<tree_classdef_property *>
@@ -240,17 +239,16 @@
   tree_classdef_property_list (const octave::base_list<tree_classdef_property *>& a)
     : octave::base_list<tree_classdef_property *> (a) { }
 
-  ~tree_classdef_property_list (void);
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_property_list (const tree_classdef_property_list&) = delete;
 
-  tree_classdef_property_list& operator = (const tree_classdef_property_list&) = delete;
+  tree_classdef_property_list&
+  operator = (const tree_classdef_property_list&) = delete;
+
+  ~tree_classdef_property_list (void);
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_properties_block
@@ -265,17 +263,16 @@
                                   int l = -1, int c = -1)
     : tree_classdef_element<tree_classdef_property *> (a, plist, lc, tc, l, c) { }
 
-  ~tree_classdef_properties_block (void) = default;
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_properties_block (const tree_classdef_properties_block&) = delete;
 
-  tree_classdef_properties_block& operator = (const tree_classdef_properties_block&) = delete;
+  tree_classdef_properties_block&
+  operator = (const tree_classdef_properties_block&) = delete;
+
+  ~tree_classdef_properties_block (void) = default;
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_methods_list : public octave::base_list<octave_value>
@@ -289,17 +286,16 @@
   tree_classdef_methods_list (const octave::base_list<octave_value>& a)
     : octave::base_list<octave_value> (a) { }
 
-  ~tree_classdef_methods_list (void) = default;
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_methods_list (const tree_classdef_methods_list&) = delete;
 
-  tree_classdef_methods_list& operator = (const tree_classdef_methods_list&) = delete;
+  tree_classdef_methods_list&
+  operator = (const tree_classdef_methods_list&) = delete;
+
+  ~tree_classdef_methods_list (void) = default;
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_methods_block : public tree_classdef_element<octave_value>
@@ -312,17 +308,16 @@
                                octave_comment_list *tc, int l = -1, int c = -1)
     : tree_classdef_element<octave_value> (a, mlist, lc, tc, l, c) { }
 
-  ~tree_classdef_methods_block (void) = default;
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_methods_block (const tree_classdef_methods_block&) = delete;
 
-  tree_classdef_methods_block& operator = (const tree_classdef_methods_block&) = delete;
+  tree_classdef_methods_block&
+  operator = (const tree_classdef_methods_block&) = delete;
+
+  ~tree_classdef_methods_block (void) = default;
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_event
@@ -331,6 +326,12 @@
 
   tree_classdef_event (tree_identifier *i = 0) : id (i) { }
 
+  // No copying!
+
+  tree_classdef_event (const tree_classdef_event&) = delete;
+
+  tree_classdef_event& operator = (const tree_classdef_event&) = delete;
+
   ~tree_classdef_event (void)
   {
     delete id;
@@ -343,12 +344,6 @@
 private:
 
   tree_identifier *id;
-
-  // No copying!
-
-  tree_classdef_event (const tree_classdef_event&) = delete;
-
-  tree_classdef_event& operator = (const tree_classdef_event&) = delete;
 };
 
 class tree_classdef_events_list : public octave::base_list<tree_classdef_event *>
@@ -362,17 +357,16 @@
   tree_classdef_events_list (const octave::base_list<tree_classdef_event *>& a)
     : octave::base_list<tree_classdef_event *> (a) { }
 
-  ~tree_classdef_events_list (void);
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_events_list (const tree_classdef_events_list&) = delete;
 
-  tree_classdef_events_list& operator = (const tree_classdef_events_list&) = delete;
+  tree_classdef_events_list&
+  operator = (const tree_classdef_events_list&) = delete;
+
+  ~tree_classdef_events_list (void);
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_events_block
@@ -386,17 +380,16 @@
                               octave_comment_list *tc, int l = -1, int c = -1)
     : tree_classdef_element<tree_classdef_event *> (a, elist, lc, tc, l, c) { }
 
-  ~tree_classdef_events_block (void) = default;
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_events_block (const tree_classdef_events_block&) = delete;
 
-  tree_classdef_events_block& operator = (const tree_classdef_events_block&) = delete;
+  tree_classdef_events_block&
+  operator = (const tree_classdef_events_block&) = delete;
+
+  ~tree_classdef_events_block (void) = default;
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_enum
@@ -408,6 +401,12 @@
   tree_classdef_enum (tree_identifier *i, tree_expression *e)
     : id (i), expr (e) { }
 
+  // No copying!
+
+  tree_classdef_enum (const tree_classdef_enum&) = delete;
+
+  tree_classdef_enum& operator = (const tree_classdef_enum&) = delete;
+
   ~tree_classdef_enum (void)
   {
     delete id;
@@ -424,12 +423,6 @@
 
   tree_identifier *id;
   tree_expression *expr;
-
-  // No copying!
-
-  tree_classdef_enum (const tree_classdef_enum&) = delete;
-
-  tree_classdef_enum& operator = (const tree_classdef_enum&) = delete;
 };
 
 class tree_classdef_enum_list : public octave::base_list<tree_classdef_enum *>
@@ -443,17 +436,15 @@
   tree_classdef_enum_list (const octave::base_list<tree_classdef_enum *>& a)
     : octave::base_list<tree_classdef_enum *> (a) { }
 
-  ~tree_classdef_enum_list (void);
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_enum_list (const tree_classdef_enum_list&) = delete;
 
   tree_classdef_enum_list& operator = (const tree_classdef_enum_list&) = delete;
+
+  ~tree_classdef_enum_list (void);
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_enum_block
@@ -467,17 +458,16 @@
                             octave_comment_list *tc, int l = -1, int c = -1)
     : tree_classdef_element<tree_classdef_enum *> (a, elist, lc, tc, l, c) { }
 
-  ~tree_classdef_enum_block (void) = default;
-
-  void accept (tree_walker&);
-
-private:
-
   // No copying!
 
   tree_classdef_enum_block (const tree_classdef_enum_block&) = delete;
 
-  tree_classdef_enum_block& operator = (const tree_classdef_enum_block&) = delete;
+  tree_classdef_enum_block&
+  operator = (const tree_classdef_enum_block&) = delete;
+
+  ~tree_classdef_enum_block (void) = default;
+
+  void accept (tree_walker&);
 };
 
 class tree_classdef_body
@@ -523,6 +513,12 @@
     append (enb);
   }
 
+  // No copying!
+
+  tree_classdef_body (const tree_classdef_body&) = delete;
+
+  tree_classdef_body& operator = (const tree_classdef_body&) = delete;
+
   ~tree_classdef_body (void);
 
   void append (tree_classdef_properties_block *pb)
@@ -576,12 +572,6 @@
   std::list<tree_classdef_events_block *> events_lst;
 
   std::list<tree_classdef_enum_block *> enum_lst;
-
-  // No copying!
-
-  tree_classdef_body (const tree_classdef_body&) = delete;
-
-  tree_classdef_body& operator = (const tree_classdef_body&) = delete;
 };
 
 // Classdef definition.
@@ -600,6 +590,12 @@
       supclass_list (sc), element_list (b), lead_comm (lc), trail_comm (tc),
       pack_name (pn) { }
 
+  // No copying!
+
+  tree_classdef (const tree_classdef&) = delete;
+
+  tree_classdef& operator = (const tree_classdef&) = delete;
+
   ~tree_classdef (void)
   {
     delete attr_list;
@@ -644,12 +640,6 @@
   octave_comment_list *trail_comm;
 
   std::string pack_name;
-
-  // No copying!
-
-  tree_classdef (const tree_classdef&) = delete;
-
-  tree_classdef& operator = (const tree_classdef&) = delete;
 };
 
 #endif