Skip to content

Commit 7a2b7ac

Browse files
committed
Fixed name conflict between atomics imported from kotlinx.atomicfu.* and kotlin.native.concurrent.*
1 parent a0106a8 commit 7a2b7ac

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

kotlinx-coroutines-core/common/src/internal/ConcurrentLinkedList.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package kotlinx.coroutines.internal
66

77
import kotlinx.atomicfu.*
88
import kotlinx.coroutines.*
9-
import kotlin.native.concurrent.*
9+
import kotlin.native.concurrent.SharedImmutable
1010

1111
// Returns the first segment `s` with `s.id >= id` or `CLOSED`
1212
// if all the segments in this linked list have lower `id` and the list is closed for further segment additions.

kotlinx-coroutines-core/common/src/sync/Semaphore.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kotlinx.coroutines.*
99
import kotlinx.coroutines.internal.*
1010
import kotlin.coroutines.*
1111
import kotlin.math.*
12-
import kotlin.native.concurrent.*
12+
import kotlin.native.concurrent.SharedImmutable
1313

1414
/**
1515
* A counting semaphore for coroutines that logically maintains a number of available permits.

0 commit comments

Comments
 (0)