Changeset a5a71d0 for src/ResolvExpr/AdjustExprType.cc

Timestamp:

Apr 6, 2016, 5:11:32 PM (9 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:

eab39cd

Parents:

39786813 (diff), 3aba311 (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 'fix-memory-error' into ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Makefile.in
src/Parser/DeclarationNode.cc
src/Parser/ParseNode.h
src/Parser/TypeData.cc
src/Parser/parser.cc
src/Parser/parser.yy
src/ResolvExpr/Resolver.cc
src/SymTab/Validate.cc
src/SynTree/Declaration.h
src/SynTree/Mutator.cc
src/SynTree/Mutator.h
src/SynTree/SynTree.h
src/SynTree/Visitor.cc
src/SynTree/Visitor.h
src/libcfa/prelude.cf

File:

• src/ResolvExpr/AdjustExprType.cc (modified) (3 diffs)

src/ResolvExpr/AdjustExprType.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:41:42 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 23:54:02 2015
-// Update Count     : 3
+// Last Modified On : Wed Mar  2 17:34:53 2016
+// Update Count     : 4
 // 
 
@@ -33 +33 @@
                 virtual Type* mutate( UnionInstType *aggregateUseType );
                 virtual Type* mutate( EnumInstType *aggregateUseType );
-                virtual Type* mutate( ContextInstType *aggregateUseType );
+                virtual Type* mutate( TraitInstType *aggregateUseType );
                 virtual Type* mutate( TypeInstType *aggregateUseType );
                 virtual Type* mutate( TupleType *tupleType );
@@ -87 +87 @@
         }
 
-        Type *AdjustExprType::mutate( ContextInstType *aggregateUseType ) {
+        Type *AdjustExprType::mutate( TraitInstType *aggregateUseType ) {
                 return aggregateUseType;
         }