Changeset 21a44ca for src/AST/Node.hpp

Timestamp:

May 23, 2019, 6:24:18 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

6f4b7f2, d908563

Parents:

94b1f718 (diff), f1ec88a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Node.hpp (modified) (3 diffs)

src/AST/Node.hpp

@@ -10 +10 @@
 // Created On       : Wed May 8 10:27:04 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 15 16:02:00 2019
-// Update Count     : 3
+// Last Modified On : Thu May 23 16:00:00 2019
+// Update Count     : 4
 //
 
@@ -109 +109 @@
         ~ptr_base() { if( node ) _dec(node); }
 
+        ptr_base( const ptr_base & o ) : node(o.node) {
+                if( node ) _inc(node);
+        }
+
+        ptr_base( ptr_base && o ) : node(o.node) {
+                if( node ) _inc(node);
+        }
+
         template< enum Node::ref_type o_ref_t >
         ptr_base( const ptr_base<node_t, o_ref_t> & o ) : node(o.node) {
@@ -122 +130 @@
         ptr_base & operator=( const o_node_t * node ) {
                 assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
+                return *this;
+        }
+
+        ptr_base & operator=( const ptr_base & o ) {
+                assign(o.node);
+                return *this;
+        }
+
+        ptr_base & operator=( ptr_base && o ) {
+                assign(o.node);
                 return *this;
         }