Changeset a935892 for src/AST/Node.hpp

Timestamp:

Jun 3, 2019, 10:54:01 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0e315a5, dafe9e1

Parents:

043a5b6 (diff), 8d70648 (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) (2 diffs)

src/AST/Node.hpp

@@ -113 +113 @@
         }
 
-        ptr_base( ptr_base && o ) : node(o.node) {
-                if( node ) _inc(node);
-        }
+        ptr_base( ptr_base && o ) : node(o.node) { o.node = nullptr; }
 
         template< enum Node::ref_type o_ref_t >
@@ -139 +137 @@
 
         ptr_base & operator=( ptr_base && o ) {
-                assign(o.node);
+                if ( node == o.node ) return *this;
+                if ( node ) _dec(node);
+                node = o.node;
+                o.node = nullptr;
                 return *this;
         }