diff --git a/osdep/mac/option_helper.swift b/osdep/mac/option_helper.swift index c6612d0218..996ec3db45 100644 --- a/osdep/mac/option_helper.swift +++ b/osdep/mac/option_helper.swift @@ -22,9 +22,12 @@ typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Voi class OptionHelper: NSObject { var vo: UnsafeMutablePointer var optsCachePtr: UnsafeMutablePointer - var optsPtr: UnsafeMutablePointer var macOptsCachePtr: UnsafeMutablePointer + + var optsPtr: UnsafeMutablePointer + { get { return UnsafeMutablePointer(OpaquePointer(optsCachePtr.pointee.opts)) } } var macOptsPtr: UnsafeMutablePointer + { get { return UnsafeMutablePointer(OpaquePointer(macOptsCachePtr.pointee.opts)) } } // these computed properties return a local copy of the struct accessed: // - don't use if you rely on the pointers @@ -42,9 +45,7 @@ class OptionHelper: NSObject { exit(1) } optsCachePtr = cache - optsPtr = UnsafeMutablePointer(OpaquePointer(cache.pointee.opts)) macOptsCachePtr = macCache - macOptsPtr = UnsafeMutablePointer(OpaquePointer(macCache.pointee.opts)) } func nextChangedOption(property: inout UnsafeMutableRawPointer?) -> Bool {