diff options
| author | Roman Elizarov <elizarov@gmail.com> | 2020-03-31 14:05:57 +0300 |
|---|---|---|
| committer | Roman Elizarov <elizarov@gmail.com> | 2020-03-31 14:05:57 +0300 |
| commit | 52dcddccf450fdcc718e206be7ed728052affe1a (patch) | |
| tree | 90c1b2289a87bb52777c65b79e60b0c0552e852e | |
| parent | 96b41b4e609e78344cbef67f793ad93fc6bb97d9 (diff) | |
| parent | a3384a80659632f22dc2f032e7199b2ac178994a (diff) | |
| download | kotlinx.coroutines-52dcddccf450fdcc718e206be7ed728052affe1a.tar.gz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt | 2 | ||||
| -rw-r--r-- | kotlinx-coroutines-core/common/src/channels/ConflatedChannel.kt | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt b/kotlinx-coroutines-core/common/src/channels/ConflatedBroadcastChannel.kt index 9e093b77..2b9375dd 100644 --- 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 index 399019c3..47347669 100644 --- 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") } |