Merge remote-tracking branch 'origin/master' into develop

Kotlin · Mar 31, 2020 · 52dcddc · 52dcddc
2 parents 96b41b4 + a3384a8
commit 52dcddc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt b/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt
@@ -47,9 +47,7 @@ public class ConflatedBroadcastChannel<E>() : BroadcastChannel<E> {
     private val onCloseHandler = atomic<Any?>(null)
 
     private companion object {
-        @SharedImmutable
         private val CLOSED = Closed(null)
-        @SharedImmutable
         private val UNDEFINED = Symbol("UNDEFINED")
         private val INITIAL_STATE = State<Any?>(UNDEFINED, null)
     }

diff --git a/kotlinx-coroutines-core/common/src/channels/ConflatedChannel.kt b/kotlinx-coroutines-core/common/src/channels/ConflatedChannel.kt
@@ -31,7 +31,6 @@ internal open class ConflatedChannel<E> : AbstractChannel<E>() {
     private var value: Any? = EMPTY
 
     private companion object {
-        @SharedImmutable
         private val EMPTY = Symbol("EMPTY")
     }