From 453a36070796556d2b6974cd5951870fbbde3eb0 Mon Sep 17 00:00:00 2001 From: Svyatoslav Scherbina Date: Tue, 22 Nov 2016 16:18:48 +0700 Subject: [PATCH] Interop/Runtime: add minor code improvements --- .../src/main/kotlin/kotlin_/cinterop/Utils.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt b/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt index f1a255c5e49..94063f1763e 100644 --- a/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt +++ b/Interop/Runtime/src/main/kotlin/kotlin_/cinterop/Utils.kt @@ -75,11 +75,11 @@ inline fun NativePlacement.allocArray(length: Int): CArr * @param T must not be abstract */ inline fun NativePlacement.allocArray(length: Long, - initializer: T.(Long)->Unit): CArray { + initializer: T.(index: Long)->Unit): CArray { val res = allocArray(length) - (0 until length).forEach { - res[it].initializer(it) + (0 until length).forEach { index -> + res[index].initializer(index) } return res @@ -90,8 +90,11 @@ inline fun NativePlacement.allocArray(length: Long, * * @param T must not be abstract */ -inline fun NativePlacement.allocArray(length: Int, initializer: T.(Long)->Unit) = - allocArray(length.toLong(), initializer) +inline fun NativePlacement.allocArray(length: Int, + initializer: T.(index: Int)->Unit): CArray = + allocArray(length.toLong()) { index -> + this.initializer(index.toInt()) + } /**