diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintIncorporator.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintIncorporator.kt index bbe268cb76d..6c49a393e4d 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintIncorporator.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintIncorporator.kt @@ -16,7 +16,7 @@ import java.util.* // todo problem: intersection types in constrains: A <: Number, B <: Inv =>? B <: Inv class ConstraintIncorporator( - val typeApproximator: TypeApproximator, + val typeApproximator: AbstractTypeApproximator, val trivialConstraintTypeInferenceOracle: TrivialConstraintTypeInferenceOracle ) { diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt index b7ff4875b42..50b096a33f0 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.model.* import java.util.* import kotlin.math.max -class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val typeApproximator: TypeApproximator) { +class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val typeApproximator: AbstractTypeApproximator) { private val ALLOWED_DEPTH_DELTA_FOR_INCORPORATION = 1 interface Context : TypeSystemInferenceExtensionContext {