From 88abcdbde5b6d99cfe84c1ed5da12ed3580fd221 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 28 Apr 2015 17:34:06 +0300 Subject: [PATCH] Minor, remove workarounds for the fixed KT-5786 --- .../kotlin/serialization/builtins/BuiltInsSerializer.kt | 2 +- .../src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt index 2154266688c..c2441b28e10 100644 --- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializer.kt @@ -138,7 +138,7 @@ public class BuiltInsSerializer(private val dependOnOldBuiltIns: Boolean) { BuiltInsSerializationUtil.FallbackPaths.getStringTableFilePath(fqName)) } - internal /* KT-5786 */ fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream, legacyFileName: String? = null) { + private fun write(destDir: File, fileName: String, stream: ByteArrayOutputStream, legacyFileName: String? = null) { totalSize += stream.size() totalFiles++ File(destDir, fileName).getParentFile().mkdirs() diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt index ea2231e7778..754ef2d21c4 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KCallableContainerImpl.kt @@ -111,7 +111,7 @@ abstract class KCallableContainerImpl { } } - /* private // KT-5786 */ fun loadJvmType( + private fun loadJvmType( type: JvmProtoBuf.JvmType, nameResolver: NameResolver, classLoader: ClassLoader,