Changeset d1b9d78 for src/Parser/ParseNode.cc

Timestamp:

Jul 13, 2016, 1:44:00 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9c791dd

Parents:

8884112 (diff), ed9ecda (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/Parser/ParseNode.cc (modified) (2 diffs)

src/Parser/ParseNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:26:29 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 30 21:13:12 2016
-// Update Count     : 52
+// Last Modified On : Tue Jul 12 17:19:57 2016
+// Update Count     : 53
 // 
 
@@ -196 +196 @@
 
 ParseNode *ParseNode::set_link( ParseNode *next_ ) {
-        if ( next_ == 0 ) return this;
-        get_last()->next = next_;
+        if ( next_ != 0 ) get_last()->next = next_;
         return this;
 }