diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-16 23:01:19 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-09-16 23:01:19 +0000 |
| commit | 084ccb1e0c54645b6e22faede8744851a591548d (patch) | |
| tree | c0db818d56bf3554442face0d6f3d53b70a11b0c /src | |
| parent | e557acb9a7d672c0635c3eaf9fe385adc41e5c86 (diff) | |
| download | scala-084ccb1e0c54645b6e22faede8744851a591548d.tar.gz scala-084ccb1e0c54645b6e22faede8744851a591548d.tar.bz2 scala-084ccb1e0c54645b6e22faede8744851a591548d.zip | |
argh -- merge failure?? -- this was fixed
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/Types.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |