Skip to content

Commit 60c738a

Browse files
committed
fix tests for adjuted visibility
1 parent 6548e50 commit 60c738a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Tests/Foundation/Tests/TestNSData.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import CoreFoundation
2020
class TestNSData: LoopbackServerTest {
2121

2222
class AllOnesImmutableData : NSData {
23-
private var _length : Int
23+
private var __length : Int
2424
var _pointer : UnsafeMutableBufferPointer<UInt8>? {
2525
willSet {
2626
if let p = _pointer { free(p.baseAddress) }
2727
}
2828
}
2929

3030
init(length: Int) {
31-
_length = length
31+
__length = length
3232
super.init()
3333
}
3434

@@ -45,7 +45,7 @@ class TestNSData: LoopbackServerTest {
4545

4646
override var length : Int {
4747
get {
48-
return _length
48+
return __length
4949
}
5050
}
5151

@@ -78,15 +78,15 @@ class TestNSData: LoopbackServerTest {
7878

7979
class AllOnesData : NSMutableData {
8080

81-
private var _length : Int
81+
private var __length : Int
8282
var _pointer : UnsafeMutableBufferPointer<UInt8>? {
8383
willSet {
8484
if let p = _pointer { free(p.baseAddress) }
8585
}
8686
}
8787

8888
override init(length: Int) {
89-
_length = length
89+
__length = length
9090
super.init()
9191
}
9292

@@ -103,22 +103,22 @@ class TestNSData: LoopbackServerTest {
103103

104104
override var length : Int {
105105
get {
106-
return _length
106+
return __length
107107
}
108108
set {
109109
if let ptr = _pointer {
110110
// Copy the data to our new length buffer
111111
let newBuffer = malloc(newValue)!
112-
if newValue <= _length {
112+
if newValue <= __length {
113113
memmove(newBuffer, ptr.baseAddress!, newValue)
114-
} else if newValue > _length {
115-
memmove(newBuffer, ptr.baseAddress!, _length)
116-
memset(newBuffer + _length, 1, newValue - _length)
114+
} else if newValue > __length {
115+
memmove(newBuffer, ptr.baseAddress!, __length)
116+
memset(newBuffer + __length, 1, newValue - __length)
117117
}
118118
let bytePtr = newBuffer.bindMemory(to: UInt8.self, capacity: newValue)
119119
_pointer = UnsafeMutableBufferPointer(start: bytePtr, count: newValue)
120120
}
121-
_length = newValue
121+
__length = newValue
122122
}
123123
}
124124

@@ -138,7 +138,7 @@ class TestNSData: LoopbackServerTest {
138138
}
139139

140140
override var mutableBytes: UnsafeMutableRawPointer {
141-
let newBufferLength = _length
141+
let newBufferLength = __length
142142
let newBuffer = malloc(newBufferLength)
143143
if let ptr = _pointer {
144144
// Copy the existing data to the new box, then return its pointer
@@ -150,7 +150,7 @@ class TestNSData: LoopbackServerTest {
150150
let bytePtr = newBuffer!.bindMemory(to: UInt8.self, capacity: newBufferLength)
151151
let result = UnsafeMutableBufferPointer(start: bytePtr, count: newBufferLength)
152152
_pointer = result
153-
_length = newBufferLength
153+
__length = newBufferLength
154154
return UnsafeMutableRawPointer(result.baseAddress!)
155155
}
156156

0 commit comments

Comments
 (0)