diff options
| author | Tor Norbye <tnorbye@google.com> | 2016-01-21 19:11:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-21 19:11:29 +0000 |
| commit | a138270e662e29ee982942a9d963af5c45d0e8c2 (patch) | |
| tree | e0c024a94ad083f1b578b0f42b9e14af10ee4948 | |
| parent | 4ddbca5383818f2b4bd141be848ee8721fd8b3de (diff) | |
| parent | 39113ca579a3d4e1c24e204f102e6dc9b26125af (diff) | |
| download | data-binding-a138270e662e29ee982942a9d963af5c45d0e8c2.tar.gz | |
Merge "Update Kotlin code to be beta 4 compatible" into studio-master-dev
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt | 4 | ||||
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt index f991d405..906880a0 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/KCode.kt @@ -81,7 +81,7 @@ class KCode (private val s : String? = null){ return this } - fun nl(c : KCode?) : KCode { + infix fun nl(c : KCode?) : KCode { if (c == null || isNull(c)) { return this } @@ -90,7 +90,7 @@ class KCode (private val s : String? = null){ return this } - fun nl(s : String?, init : (KCode.() -> Unit)? = null) : KCode { + infix fun nl(s : String?, init : (KCode.() -> Unit)? = null) : KCode { val c = KCode(s) if (init != null) { c.init() diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt index e52daf3c..324c2e9c 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt @@ -49,7 +49,7 @@ enum class Scope { class ExprModelExt { val usedFieldNames = hashMapOf<Scope, MutableSet<String>>(); init { - Scope.values.forEach { usedFieldNames[it] = hashSetOf<String>() } + Scope.values().forEach { usedFieldNames[it] = hashSetOf<String>() } } val localizedFlags = arrayListOf<FlagSet>() |