From 49a420e3f91dad590ab638143ba1acdb4357b049 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 7 Oct 2015 11:48:37 +0300 Subject: [PATCH] Build fixed (deprecated protected in interface) --- .../src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt index d86e13a99c2..f60620a886d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt @@ -100,10 +100,10 @@ public object ModifierCheckerCore { private val deprecatedParentTargetMap = mapOf>( // Deprecated in M14, forbidden in M15 INTERNAL_KEYWORD to EnumSet.of(INTERFACE), - PROTECTED_KEYWORD to EnumSet.of(INTERFACE), + PROTECTED_KEYWORD to EnumSet.of(INTERFACE, OBJECT), // Deprecated in M15 - FINAL_KEYWORD to EnumSet.of(INTERFACE), - PROTECTED_KEYWORD to EnumSet.of(OBJECT) + FINAL_KEYWORD to EnumSet.of(INTERFACE) + //PROTECTED_KEYWORD to EnumSet.of(OBJECT) ) // First modifier in pair should be also first in declaration