Skip to content

Commit a71a39d

Browse files
committed
Merge branch 'develop'
2 parents 5785361 + 5f75ff2 commit a71a39d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Sources/SafePointer/ObservableMutableSafePointer.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@ public extension ObservableMutableSafePointer {
127127

128128

129129

130-
/// The type of identifier used to identify a function that's been added to the observer queue
131-
typealias ObserverIdentifier = Int
132-
133130
/// An observer that's been added to the observer queue, and its corresponding identifier
134131
fileprivate typealias AddedObserver = (identifier: ObserverIdentifier, observer: OnPointeeDidChange)
135132

@@ -150,6 +147,11 @@ public extension ObservableMutableSafePointer {
150147
}
151148

152149

150+
151+
/// The type of identifier used to identify a function that's been added to the observer queue
152+
public typealias ObserverIdentifier = Int
153+
154+
153155
// OMS P
154156
public typealias MutableSafeObservablePointer<Value> = ObservableMutableSafePointer<Value> // MSO P
155157
public typealias SafeObservableMutablePointer<Value> = ObservableMutableSafePointer<Value> // SOM P

Tests/SafePointerTests/SafePointerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ final class SafePointerTests: XCTestCase {
287287

288288

289289
let value = PassByValue(innerValue: 0)
290-
var updateWitnessAIdentifier = ObservableMutableSafePointer.ObserverIdentifier()
290+
var updateWitnessAIdentifier = ObserverIdentifier()
291291
let reference = ObservableMutableSafePointer(to: value, newObserverIdentifier: &updateWitnessAIdentifier, onPointeeDidChange: updateWitnessA)
292292
let updateWitnessBIdentifier = reference.addObserver(updateWitnessB)
293293
let referenceCopyA = reference

0 commit comments

Comments
 (0)