Changeset 893256d for src/SynTree/Mutator.h

Timestamp:

Jul 20, 2015, 2:29:52 PM (10 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, with_gc

Children:

18997b9

Parents:

2794fff (diff), 994ec2c (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 ctor

Conflicts:

src/Parser/ParseNode.h

File:

• src/SynTree/Mutator.h (modified) (2 diffs)

src/SynTree/Mutator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 29 16:34:08 2015
-// Update Count     : 4
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jul 13 18:14:47 2015
+// Update Count     : 5
 //
 #include <cassert>
@@ -26 +26 @@
         virtual ~Mutator();
   public:
-        virtual ObjectDecl* mutate( ObjectDecl *objectDecl );
+        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl );
         virtual DeclarationWithType* mutate( FunctionDecl *functionDecl );
         virtual Declaration* mutate( StructDecl *aggregateDecl );