Changeset e7f8119 for src/AST/Node.hpp

Timestamp:

Jun 10, 2019, 10:52:03 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:

6355ba7

Parents:

9856ca9 (diff), 61c7239 (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) (4 diffs)

src/AST/Node.hpp

@@ -154 +154 @@
 
         template< enum Node::ref_type o_ref_t >
-        ptr_base( const ptr_base<node_t, o_ref_t> & o ) : node(o.node) {
+        ptr_base( const ptr_base<node_t, o_ref_t> & o ) : node(o.get()) {
                 if( node ) _inc(node);
         }
 
         template< enum Node::ref_type o_ref_t >
-        ptr_base( ptr_base<node_t, o_ref_t> && o ) : node(o.node) {
+        ptr_base( ptr_base<node_t, o_ref_t> && o ) : node(o.get()) {
                 if( node ) _inc(node);
         }
@@ -184 +184 @@
         template< enum Node::ref_type o_ref_t >
         ptr_base & operator=( const ptr_base<node_t, o_ref_t> & o ) {
-                assign(o.node);
+                assign(o.get());
                 return *this;
         }
@@ -190 +190 @@
         template< enum Node::ref_type o_ref_t >
         ptr_base & operator=( ptr_base<node_t, o_ref_t> && o ) {
-                assign(o.node);
+                assign(o.get());
                 return *this;
         }
@@ -228 +228 @@
         void _check() const;
 
-protected:
         const node_t * node;
 };