From 5bf064193017d6b920a716c31bc409aa9c06925f Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 3 Aug 2015 21:04:33 +0300 Subject: [PATCH] descriptors.proto: add skip_in_comparison option for (prepared to retire) constructor field in Class message Original commit: be875d797ffaa93bc1d92c1b644dc4edef6d9345 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 94e72b18f13..d8c1a262027 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -141,8 +141,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { - if (!checkEquals(old.constructor, new.constructor)) return false - if (!checkEqualsTypeArgument(old, new)) return false if (old.hasNullable() != new.hasNullable()) return false @@ -259,10 +257,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv return true } - open fun checkEquals(old: ProtoBuf.Type.Constructor, new: ProtoBuf.Type.Constructor): Boolean { - return true - } - open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean { if (old.hasProjection() != new.hasProjection()) return false if (old.hasProjection()) {