From fa261a76975c9498783a3fe831696dba7a802a2d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 31 Oct 2015 23:23:07 +0300 Subject: [PATCH] Add override for default method of Comparator from JDK8 --- libraries/stdlib/src/kotlin/util/Ordering.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/stdlib/src/kotlin/util/Ordering.kt b/libraries/stdlib/src/kotlin/util/Ordering.kt index 4e9da59a4a5..d43432e0b1f 100644 --- a/libraries/stdlib/src/kotlin/util/Ordering.kt +++ b/libraries/stdlib/src/kotlin/util/Ordering.kt @@ -314,12 +314,18 @@ public fun Comparator.reversed(): Comparator = when (this) { private class ReversedComparator(public val comparator: Comparator): Comparator { override fun compare(a: T, b: T): Int = comparator.compare(b, a) + @Suppress("VIRTUAL_MEMBER_HIDDEN") + fun reversed(): Comparator = comparator } private object NaturalOrderComparator : Comparator> { override fun compare(c1: Comparable, c2: Comparable): Int = c1.compareTo(c2) + @Suppress("VIRTUAL_MEMBER_HIDDEN") + fun reversed(): Comparator> = ReverseOrderComparator } private object ReverseOrderComparator: Comparator> { override fun compare(c1: Comparable, c2: Comparable): Int = c2.compareTo(c1) + @Suppress("VIRTUAL_MEMBER_HIDDEN") + fun reversed(): Comparator> = NaturalOrderComparator }