Changeset 4ae2364 for src/AST/Node.hpp

Timestamp:

Jun 3, 2019, 5:36:47 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

98a8290, ee574a2

Parents:

f474e91 (diff), dafe9e1 (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 : Thu May 23 16:00:00 2019
-// Update Count     : 4
+// Last Modified On : Mon Jun  3 13:26:00 2019
+// Update Count     : 5
 //
 
@@ -107 +107 @@
         ptr_base() : node(nullptr) {}
         ptr_base( const node_t * n ) : node(n) { if( node ) _inc(node); }
-        ~ptr_base() { if( node ) _dec(node); }
+        ~ptr_base() { if( node ) { auto tmp = node; node = nullptr; _dec(tmp); } }
 
         ptr_base( const ptr_base & o ) : node(o.node) {
@@ -127 +127 @@
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {
-                assign( node ? strict_dynamic_cast<const node_t *>(node) : nullptr );
+                assign( strict_dynamic_cast<const node_t *, nullptr>(node) );
                 return *this;
         }