From 084ccb1e0c54645b6e22faede8744851a591548d Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Thu, 16 Sep 2010 23:01:19 +0000 Subject: argh -- merge failure?? -- this was fixed --- src/compiler/scala/tools/nsc/symtab/Types.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/scala/tools/nsc/symtab/Types.scala b/src/compiler/scala/tools/nsc/symtab/Types.scala index 19665715b5..deffa1d852 100644 --- a/src/compiler/scala/tools/nsc/symtab/Types.scala +++ b/src/compiler/scala/tools/nsc/symtab/Types.scala @@ -363,7 +363,7 @@ trait Types extends reflect.generic.Types { self: SymbolTable => */ def remove(clazz: Symbol): Type = this - def resultApprox: Type = ApproximateDependentMap(resultType) + def resultApprox: Type = if(settings.YdepMethTpes.value) ApproximateDependentMap(resultType) else resultType /** For a curried method or poly type its non-method result type, * the type itself for all other types */ -- cgit v1.2.3