From 0898897057684b724e8ff9b36f2230639728a449 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 28 Sep 2017 18:08:01 +0300 Subject: [PATCH] Remove crossinline restriction from synchronized in js and common #KT-20596 Fixed --- js/js.libraries/src/core/concurrent.kt | 2 +- libraries/stdlib/common/src/kotlin/KotlinH.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/js.libraries/src/core/concurrent.kt b/js/js.libraries/src/core/concurrent.kt index 9933719ae6b..39c5f5cca71 100644 --- a/js/js.libraries/src/core/concurrent.kt +++ b/js/js.libraries/src/core/concurrent.kt @@ -36,4 +36,4 @@ public annotation class Volatile public annotation class Synchronized @kotlin.internal.InlineOnly -public inline fun synchronized(@Suppress("UNUSED_PARAMETER") lock: Any, crossinline block: () -> R): R = block() +public inline fun synchronized(@Suppress("UNUSED_PARAMETER") lock: Any, block: () -> R): R = block() diff --git a/libraries/stdlib/common/src/kotlin/KotlinH.kt b/libraries/stdlib/common/src/kotlin/KotlinH.kt index 847ea95b798..9f47a3092cf 100644 --- a/libraries/stdlib/common/src/kotlin/KotlinH.kt +++ b/libraries/stdlib/common/src/kotlin/KotlinH.kt @@ -95,7 +95,7 @@ expect fun Float.isFinite(): Boolean @Target(PROPERTY, FIELD) expect annotation class Volatile -inline expect fun synchronized(lock: Any, crossinline block: () -> R): R +public expect inline fun synchronized(lock: Any, block: () -> R): R