From 8b325e8a307fd560902b6b79cf856ade3a0c345c Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 3 Jul 2015 19:09:52 +0300 Subject: [PATCH] Make ByteArray.inputStream a method, not a property. #KT-8360 Fixed --- libraries/stdlib/src/kotlin/collections/ArraysJVM.kt | 10 ++++++++-- libraries/stdlib/test/OldStdlibTest.kt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt index 729e9dddb36..0a5b2103b0b 100644 --- a/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt +++ b/libraries/stdlib/src/kotlin/collections/ArraysJVM.kt @@ -52,12 +52,18 @@ import kotlin.jvm.internal.Intrinsic */ @Intrinsic("kotlin.arrays.array") public fun booleanArrayOf(vararg content : Boolean) : BooleanArray = content +// TODO: Move inputStream to kotlin.io +/** + * Creates an input stream for reading data from this byte array. + */ +deprecated("Use inputStream() method instead.", ReplaceWith("this.inputStream()")) +public val ByteArray.inputStream : ByteArrayInputStream + get() = inputStream() /** * Creates an input stream for reading data from this byte array. */ -public val ByteArray.inputStream : ByteArrayInputStream - get() = ByteArrayInputStream(this) +public fun ByteArray.inputStream(): ByteArrayInputStream = ByteArrayInputStream(this) /** * Creates an input stream for reading data from the specified portion of this byte array. diff --git a/libraries/stdlib/test/OldStdlibTest.kt b/libraries/stdlib/test/OldStdlibTest.kt index ea2a88713ad..60b911d99fa 100644 --- a/libraries/stdlib/test/OldStdlibTest.kt +++ b/libraries/stdlib/test/OldStdlibTest.kt @@ -27,7 +27,7 @@ class OldStdlibTest() { x [index] = index.toByte() } - for(b in x.inputStream) { + for(b in x.inputStream()) { println(b) } }