Skip to content

Commit 8d4233c

Browse files
authored
Merge pull request #1546 from compnerd/silence
2 parents d393001 + cb0b363 commit 8d4233c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Foundation/CGFloat.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ public func modf(_ x: CGFloat) -> (CGFloat, CGFloat) {
868868

869869
@_transparent
870870
public func ldexp(_ x: CGFloat, _ n: Int) -> CGFloat {
871-
return CGFloat(ldexp(x.native, n))
871+
return CGFloat(scalbn(x.native, n))
872872
}
873873

874874
@_transparent
@@ -879,7 +879,7 @@ public func frexp(_ x: CGFloat) -> (CGFloat, Int) {
879879

880880
@_transparent
881881
public func ilogb(_ x: CGFloat) -> Int {
882-
return ilogb(x.native)
882+
return x.native.exponent
883883
}
884884

885885
@_transparent

Foundation/IndexSet.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public struct IndexSet : ReferenceConvertible, Equatable, BidirectionalCollectio
105105
return IndexingIterator(_elements: self)
106106
}
107107

108-
public subscript(index : Index) -> CountableRange<IndexSet.Element> {
108+
public subscript(index : Index) -> Range<IndexSet.Element> {
109109
let indexSetRange = indexSet._range(at: index)
110110
if let intersectingRange = intersectingRange {
111111
return Swift.max(intersectingRange.lowerBound, indexSetRange.lowerBound)..<Swift.min(intersectingRange.upperBound, indexSetRange.upperBound)
@@ -722,8 +722,8 @@ private struct IndexSetBoundaryIterator : IteratorProtocol {
722722

723723
private var i1: IndexSet.RangeView.Iterator
724724
private var i2: IndexSet.RangeView.Iterator
725-
private var i1Range: CountableRange<Element>?
726-
private var i2Range: CountableRange<Element>?
725+
private var i1Range: Range<Element>?
726+
private var i2Range: Range<Element>?
727727
private var i1UsedLower: Bool
728728
private var i2UsedLower: Bool
729729

Foundation/NSRange.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ extension NSRange {
354354
length = x.count
355355
}
356356

357-
internal func toCountableRange() -> CountableRange<Int>? {
357+
internal func toCountableRange() -> Range<Int>? {
358358
if location == NSNotFound { return nil }
359359
return location..<(location+length)
360360
}

0 commit comments

Comments
 (0)