Changeset 0f9e4403 for src/ResolvExpr/AdjustExprType.cc

Timestamp:

Apr 15, 2016, 12:03:11 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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 gc_noraii

File:

• src/ResolvExpr/AdjustExprType.cc (modified) (4 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 );
+                virtual Type* mutate( VarArgsType *varArgsType );
 
                 const TypeEnvironment &env;
@@ -86 +87 @@
         }
 
-        Type *AdjustExprType::mutate( ContextInstType *aggregateUseType ) {
+        Type *AdjustExprType::mutate( TraitInstType *aggregateUseType ) {
                 return aggregateUseType;
         }
@@ -111 +112 @@
                 return tupleType;
         }
+
+        Type *AdjustExprType::mutate( VarArgsType *varArgsType ) {
+                return varArgsType;
+        }
 } // namespace ResolvExpr