Changeset 246c245 for src/AST/Pass.proto.hpp

Timestamp:

May 16, 2019, 6:51:18 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8ff178d, d66e7b7

Parents:

9b4f329 (diff), 6f8e87d (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/Pass.proto.hpp (modified) (2 diffs)

src/AST/Pass.proto.hpp

@@ -247 +247 @@
                 static inline auto addStructFwd( pass_t & pass, int, const ast::StructDecl * decl ) -> decltype( pass.indexer.addStruct( decl ), void() ) {
                         ast::StructDecl * fwd = new ast::StructDecl( decl->location, decl->name );
-                        fwd->parameters = decl->parameters;
+                        fwd->params = decl->params;
                         pass.indexer.addStruct( fwd );
                 }
@@ -257 +257 @@
                 static inline auto addUnionFwd( pass_t & pass, int, const ast::UnionDecl * decl ) -> decltype( pass.indexer.addUnion( decl ), void() ) {
                         UnionDecl * fwd = new UnionDecl( decl->location, decl->name );
-                        fwd->parameters = decl->parameters;
+                        fwd->params = decl->params;
                         pass.indexer.addUnion( fwd );
                 }