Changeset d60ccbf for src/Parser/DeclarationNode.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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' into designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/Parser/DeclarationNode.cc (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 08 16:40:37 2015
-// Update Count     : 121
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 14 14:46:32 2015
+// Update Count     : 126
 //
 
@@ -472 +472 @@
                 if ( o->get_link() ) {
                         set_link( o->get_link()->clone() );
-                }
-
+                } // if
         } // if
         delete o;