Changeset 413f7f8 for src/Parser/ParseNode.h

Timestamp:

Jul 7, 2015, 1:49:58 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, 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:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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.h (modified) (2 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 24 14:09:51 2015
-// Update Count     : 81
+// Last Modified On : Thu Jul  2 17:57:05 2015
+// Update Count     : 84
 //
 
@@ -287 +287 @@
         static DeclarationNode *newForall( DeclarationNode *);
         static DeclarationNode *newFromTypedef( std::string *);
-        static DeclarationNode *newAggregate( Aggregate kind, std::string *name, DeclarationNode *formals, ExpressionNode *actuals, DeclarationNode *fields );
+        static DeclarationNode *newAggregate( Aggregate kind, const std::string *name, ExpressionNode *actuals, DeclarationNode *fields );
         static DeclarationNode *newEnum( std::string *name, DeclarationNode *constants );
         static DeclarationNode *newEnumConstant( std::string *name, ExpressionNode *constant );