Changeset 9c23f31 for src/SynTree/TypeSubstitution.cc

Timestamp:

Sep 24, 2016, 12:19:33 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3b5e3aa

Parents:

2298f728 (diff), 7ae930a (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:

fix conflicts

File:

• src/SynTree/TypeSubstitution.cc (modified) (2 diffs)

src/SynTree/TypeSubstitution.cc

@@ -179 +179 @@
 }
 
-Type * TypeSubstitution::mutate( VoidType *basicType ) {
-        return handleType( basicType );
+Type * TypeSubstitution::mutate( VoidType *voidType ) {
+        return handleType( voidType );
 }
 
@@ -221 +221 @@
 Type * TypeSubstitution::mutate( VarArgsType *varArgsType ) {
         return handleType( varArgsType );
+}
+
+Type * TypeSubstitution::mutate( ZeroType *zeroType ) {
+        return handleType( zeroType );
+}
+
+Type * TypeSubstitution::mutate( OneType *oneType ) {
+        return handleType( oneType );
 }