From 537a9ba804c8e0fbbe87e6d7825c1cf8f07e8475 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Sat, 12 Nov 2011 21:38:27 +0400 Subject: [PATCH] fix JetOverloadTest broken in e97b91c6e47885e415108e4dd65cc7f06c583026 --- .../src/org/jetbrains/jet/lang/resolve/OverloadUtil.java | 3 +++ compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java index c33d452ada0..f430ac3a01a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java @@ -7,6 +7,9 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; */ public class OverloadUtil { + /** + * Does not check names. + */ public static OverloadCompatibilityInfo isOverloadble(FunctionDescriptor a, FunctionDescriptor b) { OverridingUtil.OverrideCompatibilityInfo overrideCompatibilityInfo = OverridingUtil.isOverridableByImpl(a, b, false); if (overrideCompatibilityInfo.isSuccess()) { diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index 1aa3f4fbc90..eb7a016e836 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -64,10 +64,6 @@ public class JetOverloadTest extends JetLiteFixture { //////////////////////////////////////////////////////////////////////////////////////////////////////////////// - assertOverloadable( - "fun ab() : Int", - "fun a() : Int"); - assertNotOverloadable( "fun a() : Int", "fun a() : Any");