From 500492930bc23b956fa13677e2f26149f7da0556 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Fri, 20 Oct 2017 15:46:26 +0300
Subject: [PATCH] Renamed isDefaultLink to isDefaultLibrary.

---
 .../kotlin/backend/konan/library/KonanLibraryReader.kt        | 2 +-
 .../kotlin/backend/konan/library/SearchPathResolver.kt        | 2 +-
 .../backend/konan/library/impl/KonanLibraryReaderImpl.kt      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibraryReader.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibraryReader.kt
index 18914a21df5..40966838ca8 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibraryReader.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/KonanLibraryReader.kt
@@ -28,7 +28,7 @@ interface KonanLibraryReader {
     val linkerOpts: List<String>
     val unresolvedDependencies: List<String>
     val escapeAnalysis: ByteArray?
-    val isDefaultLink: Boolean get() = false
+    val isDefaultLibrary: Boolean get() = false
     val isNeededForLink: Boolean get() = true
     val manifestProperties: Properties
     val moduleHeaderData: ByteArray
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt
index 20700b5355c..233ec42bbdf 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/SearchPathResolver.kt
@@ -52,7 +52,7 @@ fun SearchPathResolver.resolveImmediateLibraries(libraryNames: List<String>,
             .map{ LibraryReaderImpl(it, abiVersion, target) }
 
     val defaultLibraries = defaultLinks(nostdlib = noStdLib, noDefaultLibs = noDefaultLibs).map {
-        LibraryReaderImpl(it, abiVersion, target, isDefaultLink = true)
+        LibraryReaderImpl(it, abiVersion, target, isDefaultLibrary = true)
     }
 
     // Make sure the user provided ones appear first, so that 
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
index aaafadb169e..ef226dde9bd 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryReaderImpl.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.konan.target.KonanTarget
 
 class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
-    val target: KonanTarget? = null, override val isDefaultLink: Boolean = false)
+    val target: KonanTarget? = null, override val isDefaultLibrary: Boolean = false)
     : KonanLibraryReader {
 
     // For the zipped libraries inPlace gives files from zip file system
@@ -98,5 +98,5 @@ class LibraryReaderImpl(var libraryFile: File, val currentAbiVersion: Int,
 
 }
 
-internal fun <T: KonanLibraryReader> List<T>.purgeUnneeded(): List<T> = this.filter{ !it.isDefaultLink || it.isNeededForLink }
+internal fun <T: KonanLibraryReader> List<T>.purgeUnneeded(): List<T> = this.filter{ !it.isDefaultLibrary || it.isNeededForLink }