From 292af9eea177566dab87e17491e064571dde4304 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 21 Sep 2012 18:19:30 +0400 Subject: [PATCH] Allowed changing variance from 'invariant' to 'in' and 'out' in alternative signatures. --- .../jet/lang/resolve/java/AlternativeSignatureData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java index e65653bc8ee..252c5856cdd 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AlternativeSignatureData.java @@ -375,7 +375,7 @@ class AlternativeSignatureData { fail("Star projection is not available in alternative signatures"); default: } - if (altVariance != variance) { + if (altVariance != variance && variance != Variance.INVARIANT) { fail("Variance mismatch, actual: %s, in alternative signature: %s", variance, altVariance); } }