Changeset b751c8e for src/Parser/DeclarationNode.cc

Timestamp:

Jun 29, 2017, 12:02:24 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8ee50281

Parents:

b227f68 (diff), 8c680e9 (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/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 : Peter A. Buhr
-// Last Modified On : Fri Mar 17 15:46:33 2017
-// Update Count     : 1018
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jun 28 15:27:00 2017
+// Update Count     : 1019
 //
 
@@ -1063 +1063 @@
           case TypeData::Enum:
           case TypeData::Aggregate: {
-                  ReferenceToType * ret = buildComAggInst( type, attributes );
+                  ReferenceToType * ret = buildComAggInst( type, attributes, linkage );
                   buildList( type->aggregate.actuals, ret->get_parameters() );
                   return ret;