From 3cee19d28eedf5e22486c588a7bc342376c935f9 Mon Sep 17 00:00:00 2001
From: Nikolay Igotti <nikolay.igotti@jetbrains.com>
Date: Fri, 2 Dec 2016 16:06:04 +0300
Subject: [PATCH] Fix couple compiler warnings.

---
 .../org/jetbrains/kotlin/native/interop/indexer/Indexer.kt    | 4 ++--
 .../org/jetbrains/kotlin/native/interop/gen/jvm/main.kt       | 4 ++--
 runtime/src/main/cpp/ToString.cpp                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt
index 933519467f9..898ced4cc32 100644
--- a/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt
+++ b/Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt
@@ -313,8 +313,8 @@ fun buildNativeIndexImpl(headerFile: File, args: List<String>): NativeIndex {
                 importedASTFile.value = null
                 startedTranslationUnit.value = null
                 indexDeclaration.value = staticCFunction { clientData, info ->
-                    val index = StableObjPtr.fromValue(clientData!!).get() as NativeIndexImpl
-                    index.indexDeclaration(info!!.pointed)
+                    val nativeIndex = StableObjPtr.fromValue(clientData!!).get() as NativeIndexImpl
+                    nativeIndex.indexDeclaration(info!!.pointed)
                 }
                 indexEntityReference.value = null
             }
diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
index 0d2c092c42d..fb86c6ba379 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
@@ -87,8 +87,8 @@ private fun Properties.getSpaceSeparated(name: String): List<String> {
 }
 
 private fun List<String>?.isTrue(): Boolean {
-    // The rightmost wins
-    return this?.last() == "true" ?: false
+    // The rightmost wins, null != "true".
+    return this?.last() == "true"
 }
 
 private fun processLib(ktGenRoot: String,
diff --git a/runtime/src/main/cpp/ToString.cpp b/runtime/src/main/cpp/ToString.cpp
index d73279e2878..c2d6a30ad24 100644
--- a/runtime/src/main/cpp/ToString.cpp
+++ b/runtime/src/main/cpp/ToString.cpp
@@ -51,7 +51,7 @@ KString Kotlin_Int_toString(KInt value) {
 
 KString Kotlin_Long_toString(KLong value) {
   char cstring[32];
-  snprintf(cstring, sizeof(cstring), "%lld", value);
+  snprintf(cstring, sizeof(cstring), "%lld", static_cast<long long>(value));
   return makeString(cstring);
 }