azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-13355: fix Kotlin compilation.

Browse Source
This commit is contained in:
Dmitry Petrov
2017-01-19 11:10:56 +03:00
parent b36e3bc083
commit 5fc8208504
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/TypeAliasDescriptor.kt
+2
View File
@@ -30,5 +30,7 @@ interface TypeAliasDescriptor : ClassifierDescriptorWithTypeParameters {
val classDescriptor: ClassDescriptor? val classDescriptor: ClassDescriptor?
override fun getOriginal(): TypeAliasDescriptor
override fun substitute(substitutor: TypeSubstitutor): TypeAliasDescriptor override fun substitute(substitutor: TypeSubstitutor): TypeAliasDescriptor
} }
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt
+2
View File
@@ -76,6 +76,8 @@ abstract class AbstractTypeAliasDescriptor(
override fun toString(): String = "typealias ${name.asString()}" override fun toString(): String = "typealias ${name.asString()}"
override fun getOriginal(): TypeAliasDescriptor = super.getOriginal() as TypeAliasDescriptor
protected abstract fun getTypeConstructorTypeParameters(): List<TypeParameterDescriptor> protected abstract fun getTypeConstructorTypeParameters(): List<TypeParameterDescriptor>
protected fun computeDefaultType(): SimpleType = protected fun computeDefaultType(): SimpleType =