[Stdlib] Remove @InlineOnly from expect declarations of minOf(), maxOf()

to satisfy MPP annotation checker.
It has reporting because @InlineOnly is absent on declarations with
Long parameter (removed in 233376eef0).

^KT-58551
This commit is contained in:
Roman Efremov
2023-06-30 12:45:14 +02:00
committed by Space Team
parent 6611a55a60
commit 12eb6d97bf
2 changed files with 6 additions and 12 deletions
@@ -27,28 +27,24 @@ public expect fun <T : Comparable<T>> maxOf(a: T, b: T): T
* Returns the greater of two values. * Returns the greater of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Byte, b: Byte): Byte public expect inline fun maxOf(a: Byte, b: Byte): Byte
/** /**
* Returns the greater of two values. * Returns the greater of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Short, b: Short): Short public expect inline fun maxOf(a: Short, b: Short): Short
/** /**
* Returns the greater of two values. * Returns the greater of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Int, b: Int): Int public expect inline fun maxOf(a: Int, b: Int): Int
/** /**
* Returns the greater of two values. * Returns the greater of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Long, b: Long): Long public expect inline fun maxOf(a: Long, b: Long): Long
/** /**
@@ -57,7 +53,6 @@ public expect inline fun maxOf(a: Long, b: Long): Long
* If either value is `NaN`, returns `NaN`. * If either value is `NaN`, returns `NaN`.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Float, b: Float): Float public expect inline fun maxOf(a: Float, b: Float): Float
/** /**
@@ -66,7 +61,6 @@ public expect inline fun maxOf(a: Float, b: Float): Float
* If either value is `NaN`, returns `NaN`. * If either value is `NaN`, returns `NaN`.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun maxOf(a: Double, b: Double): Double public expect inline fun maxOf(a: Double, b: Double): Double
/** /**
@@ -215,28 +209,24 @@ public expect fun <T : Comparable<T>> minOf(a: T, b: T): T
* Returns the smaller of two values. * Returns the smaller of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Byte, b: Byte): Byte public expect inline fun minOf(a: Byte, b: Byte): Byte
/** /**
* Returns the smaller of two values. * Returns the smaller of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Short, b: Short): Short public expect inline fun minOf(a: Short, b: Short): Short
/** /**
* Returns the smaller of two values. * Returns the smaller of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Int, b: Int): Int public expect inline fun minOf(a: Int, b: Int): Int
/** /**
* Returns the smaller of two values. * Returns the smaller of two values.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Long, b: Long): Long public expect inline fun minOf(a: Long, b: Long): Long
/** /**
@@ -245,7 +235,6 @@ public expect inline fun minOf(a: Long, b: Long): Long
* If either value is `NaN`, returns `NaN`. * If either value is `NaN`, returns `NaN`.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Float, b: Float): Float public expect inline fun minOf(a: Float, b: Float): Float
/** /**
@@ -254,7 +243,6 @@ public expect inline fun minOf(a: Float, b: Float): Float
* If either value is `NaN`, returns `NaN`. * If either value is `NaN`, returns `NaN`.
*/ */
@SinceKotlin("1.1") @SinceKotlin("1.1")
@kotlin.internal.InlineOnly
public expect inline fun minOf(a: Double, b: Double): Double public expect inline fun minOf(a: Double, b: Double): Double
/** /**
@@ -180,6 +180,9 @@ object ComparableOps : TemplateGroupBase() {
body { "return $defaultImpl" } body { "return $defaultImpl" }
specialFor(Primitives) { specialFor(Primitives) {
inlineOnly() inlineOnly()
on(Platform.Common) {
inline()
}
var convertBack = "to$primitive()" var convertBack = "to$primitive()"
on(Platform.JS) { on(Platform.JS) {
convertBack = "unsafeCast<$primitive>()" convertBack = "unsafeCast<$primitive>()"
@@ -381,6 +384,9 @@ object ComparableOps : TemplateGroupBase() {
body { "return $defaultImpl" } body { "return $defaultImpl" }
specialFor(Primitives) { specialFor(Primitives) {
inlineOnly() inlineOnly()
on(Platform.Common) {
inline()
}
var convertBack = "to$primitive()" var convertBack = "to$primitive()"
on(Platform.JS) { on(Platform.JS) {
convertBack = "unsafeCast<$primitive>()" convertBack = "unsafeCast<$primitive>()"