Skip to content

Commit aa22439

Browse files
liuxuan30liuxuan30
authored
Merge pull request #2279 from krbarnes/master
Fix Xcode 8.3 compiler warnings
2 parents 4a3b28d + e72fe90 commit aa22439

File tree

14 files changed

+83
-83
lines changed

14 files changed

+83
-83
lines changed

‎Source/Charts/Animation/ChartAnimationEasing.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -211,17 +211,17 @@ internal struct EasingFunctions
211211

212212
internal static let EaseInSine = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
213213
var position: TimeInterval = elapsed / duration
214-
return Double( -cos(position * M_PI_2) + 1.0 )
214+
return Double( -cos(position * Double.pi / 2) + 1.0 )
215215
}
216216

217217
internal static let EaseOutSine = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
218218
var position: TimeInterval = elapsed / duration
219-
return Double( sin(position * M_PI_2) )
219+
return Double( sin(position * Double.pi / 2) )
220220
}
221221

222222
internal static let EaseInOutSine = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
223223
var position: TimeInterval = elapsed / duration
224-
return Double( -0.5 * (cos(M_PI * position) - 1.0) )
224+
return Double( -0.5 * (cos(Double.pi * position) - 1.0) )
225225
}
226226

227227
internal static let EaseInExpo = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
@@ -286,9 +286,9 @@ internal struct EasingFunctions
286286
}
287287

288288
var p = duration * 0.3
289-
var s = p / (2.0 * M_PI) * asin(1.0)
289+
var s = p / (2.0 * Double.pi) * asin(1.0)
290290
position -= 1.0
291-
return Double( -(pow(2.0, 10.0 * position) * sin((position * duration - s) * (2.0 * M_PI) / p)) )
291+
return Double( -(pow(2.0, 10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p)) )
292292
}
293293

294294
internal static let EaseOutElastic = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
@@ -304,8 +304,8 @@ internal struct EasingFunctions
304304
}
305305

306306
var p = duration * 0.3
307-
var s = p / (2.0 * M_PI) * asin(1.0)
308-
return Double( pow(2.0, -10.0 * position) * sin((position * duration - s) * (2.0 * M_PI) / p) + 1.0 )
307+
var s = p / (2.0 * Double.pi) * asin(1.0)
308+
return Double( pow(2.0, -10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p) + 1.0 )
309309
}
310310

311311
internal static let EaseInOutElastic = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in
@@ -321,14 +321,14 @@ internal struct EasingFunctions
321321
}
322322

323323
var p = duration * (0.3 * 1.5)
324-
var s = p / (2.0 * M_PI) * asin(1.0)
324+
var s = p / (2.0 * Double.pi) * asin(1.0)
325325
if position < 1.0
326326
{
327327
position -= 1.0
328-
return Double( -0.5 * (pow(2.0, 10.0 * position) * sin((position * duration - s) * (2.0 * M_PI) / p)) )
328+
return Double( -0.5 * (pow(2.0, 10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p)) )
329329
}
330330
position -= 1.0
331-
return Double( pow(2.0, -10.0 * position) * sin((position * duration - s) * (2.0 * M_PI) / p) * 0.5 + 1.0 )
331+
return Double( pow(2.0, -10.0 * position) * sin((position * duration - s) * (2.0 * Double.pi) / p) * 0.5 + 1.0 )
332332
}
333333

334334
internal static let EaseInBack = { (elapsed: TimeInterval, duration: TimeInterval) -> Double in

‎Source/Charts/Data/Implementations/Standard/ChartData.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import Foundation
1313

1414
open class ChartData: NSObject
1515
{
16-
internal var _yMax: Double = -DBL_MAX
17-
internal var _yMin: Double = DBL_MAX
18-
internal var _xMax: Double = -DBL_MAX
19-
internal var _xMin: Double = DBL_MAX
20-
internal var _leftAxisMax: Double = -DBL_MAX
21-
internal var _leftAxisMin: Double = DBL_MAX
22-
internal var _rightAxisMax: Double = -DBL_MAX
23-
internal var _rightAxisMin: Double = DBL_MAX
16+
internal var _yMax: Double = -Double.greatestFiniteMagnitude
17+
internal var _yMin: Double = Double.greatestFiniteMagnitude
18+
internal var _xMax: Double = -Double.greatestFiniteMagnitude
19+
internal var _xMin: Double = Double.greatestFiniteMagnitude
20+
internal var _leftAxisMax: Double = -Double.greatestFiniteMagnitude
21+
internal var _leftAxisMin: Double = Double.greatestFiniteMagnitude
22+
internal var _rightAxisMax: Double = -Double.greatestFiniteMagnitude
23+
internal var _rightAxisMin: Double = Double.greatestFiniteMagnitude
2424

2525
internal var _dataSets = [IChartDataSet]()
2626

@@ -71,20 +71,20 @@ open class ChartData: NSObject
7171
/// calc minimum and maximum y value over all datasets
7272
open func calcMinMax()
7373
{
74-
_yMax = -DBL_MAX
75-
_yMin = DBL_MAX
76-
_xMax = -DBL_MAX
77-
_xMin = DBL_MAX
74+
_yMax = -Double.greatestFiniteMagnitude
75+
_yMin = Double.greatestFiniteMagnitude
76+
_xMax = -Double.greatestFiniteMagnitude
77+
_xMin = Double.greatestFiniteMagnitude
7878

7979
for set in _dataSets
8080
{
8181
calcMinMax(dataSet: set)
8282
}
8383

84-
_leftAxisMax = -DBL_MAX
85-
_leftAxisMin = DBL_MAX
86-
_rightAxisMax = -DBL_MAX
87-
_rightAxisMin = DBL_MAX
84+
_leftAxisMax = -Double.greatestFiniteMagnitude
85+
_leftAxisMin = Double.greatestFiniteMagnitude
86+
_rightAxisMax = -Double.greatestFiniteMagnitude
87+
_rightAxisMin = Double.greatestFiniteMagnitude
8888

8989
// left axis
9090
let firstLeft = getFirstLeft(dataSets: dataSets)
@@ -257,7 +257,7 @@ open class ChartData: NSObject
257257
{
258258
if axis == .left
259259
{
260-
if _leftAxisMin == DBL_MAX
260+
if _leftAxisMin == Double.greatestFiniteMagnitude
261261
{
262262
return _rightAxisMin
263263
}
@@ -268,7 +268,7 @@ open class ChartData: NSObject
268268
}
269269
else
270270
{
271-
if _rightAxisMin == DBL_MAX
271+
if _rightAxisMin == Double.greatestFiniteMagnitude
272272
{
273273
return _leftAxisMin
274274
}
@@ -295,7 +295,7 @@ open class ChartData: NSObject
295295
{
296296
if axis == .left
297297
{
298-
if _leftAxisMax == -DBL_MAX
298+
if _leftAxisMax == -Double.greatestFiniteMagnitude
299299
{
300300
return _rightAxisMax
301301
}
@@ -306,7 +306,7 @@ open class ChartData: NSObject
306306
}
307307
else
308308
{
309-
if _rightAxisMax == -DBL_MAX
309+
if _rightAxisMax == -Double.greatestFiniteMagnitude
310310
{
311311
return _leftAxisMax
312312
}

‎Source/Charts/Data/Implementations/Standard/ChartDataEntry.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ open class ChartDataEntry: ChartDataEntryBase
7979
return false
8080
}
8181

82-
if fabs((object! as AnyObject).x - x) > DBL_EPSILON
82+
if fabs((object! as AnyObject).x - x) > Double.ulpOfOne
8383
{
8484
return false
8585
}
@@ -125,12 +125,12 @@ public func ==(lhs: ChartDataEntry, rhs: ChartDataEntry) -> Bool
125125
return false
126126
}
127127

128-
if fabs(lhs.x - rhs.x) > DBL_EPSILON
128+
if fabs(lhs.x - rhs.x) > Double.ulpOfOne
129129
{
130130
return false
131131
}
132132

133-
if fabs(lhs.y - rhs.y) > DBL_EPSILON
133+
if fabs(lhs.y - rhs.y) > Double.ulpOfOne
134134
{
135135
return false
136136
}

‎Source/Charts/Data/Implementations/Standard/ChartDataEntryBase.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ open class ChartDataEntryBase: NSObject
9090
return false
9191
}
9292

93-
if fabs((object! as AnyObject).y - y) > DBL_EPSILON
93+
if fabs((object! as AnyObject).y - y) > Double.ulpOfOne
9494
{
9595
return false
9696
}
@@ -123,7 +123,7 @@ public func ==(lhs: ChartDataEntryBase, rhs: ChartDataEntryBase) -> Bool
123123
return false
124124
}
125125

126-
if fabs(lhs.y - rhs.y) > DBL_EPSILON
126+
if fabs(lhs.y - rhs.y) > Double.ulpOfOne
127127
{
128128
return false
129129
}

‎Source/Charts/Data/Implementations/Standard/ChartDataSet.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,16 @@ open class ChartDataSet: ChartBaseDataSet
5858
internal var _values: [ChartDataEntry]!
5959

6060
/// maximum y-value in the value array
61-
internal var _yMax: Double = -DBL_MAX
61+
internal var _yMax: Double = -Double.greatestFiniteMagnitude
6262

6363
/// minimum y-value in the value array
64-
internal var _yMin: Double = DBL_MAX
64+
internal var _yMin: Double = Double.greatestFiniteMagnitude
6565

6666
/// maximum x-value in the value array
67-
internal var _xMax: Double = -DBL_MAX
67+
internal var _xMax: Double = -Double.greatestFiniteMagnitude
6868

6969
/// minimum x-value in the value array
70-
internal var _xMin: Double = DBL_MAX
70+
internal var _xMin: Double = Double.greatestFiniteMagnitude
7171

7272
/// *
7373
/// - note: Calls `notifyDataSetChanged()` after setting a new value.
@@ -98,10 +98,10 @@ open class ChartDataSet: ChartBaseDataSet
9898
return
9999
}
100100

101-
_yMax = -DBL_MAX
102-
_yMin = DBL_MAX
103-
_xMax = -DBL_MAX
104-
_xMin = DBL_MAX
101+
_yMax = -Double.greatestFiniteMagnitude
102+
_yMin = Double.greatestFiniteMagnitude
103+
_xMax = -Double.greatestFiniteMagnitude
104+
_xMin = Double.greatestFiniteMagnitude
105105

106106
for e in _values
107107
{
@@ -116,8 +116,8 @@ open class ChartDataSet: ChartBaseDataSet
116116
return
117117
}
118118

119-
_yMax = -DBL_MAX
120-
_yMin = DBL_MAX
119+
_yMax = -Double.greatestFiniteMagnitude
120+
_yMin = Double.greatestFiniteMagnitude
121121

122122
let indexFrom = entryIndex(x: fromX, closestToY: Double.nan, rounding: .down)
123123
let indexTo = entryIndex(x: toX, closestToY: Double.nan, rounding: .up)

‎Source/Charts/Data/Implementations/Standard/CombinedChartData.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ open class CombinedChartData: BarLineScatterCandleBubbleChartData
9898
{
9999
_dataSets.removeAll()
100100

101-
_yMax = -DBL_MAX
102-
_yMin = DBL_MAX
103-
_xMax = -DBL_MAX
104-
_xMin = DBL_MAX
101+
_yMax = -Double.greatestFiniteMagnitude
102+
_yMin = Double.greatestFiniteMagnitude
103+
_xMax = -Double.greatestFiniteMagnitude
104+
_xMin = Double.greatestFiniteMagnitude
105105

106-
_leftAxisMax = -DBL_MAX
107-
_leftAxisMin = DBL_MAX
108-
_rightAxisMax = -DBL_MAX
109-
_rightAxisMin = DBL_MAX
106+
_leftAxisMax = -Double.greatestFiniteMagnitude
107+
_leftAxisMin = Double.greatestFiniteMagnitude
108+
_rightAxisMax = -Double.greatestFiniteMagnitude
109+
_rightAxisMin = Double.greatestFiniteMagnitude
110110

111111
let allData = self.allData
112112

‎Source/Charts/Highlight/RadarHighlighter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ open class RadarHighlighter: PieRadarHighlighter
2525
let distanceToCenter = Double(chart.distanceToCenter(x: x, y: y) / chart.factor)
2626

2727
var closest: Highlight? = nil
28-
var distance = DBL_MAX
28+
var distance = Double.greatestFiniteMagnitude
2929

3030
for high in highlights
3131
{

‎Source/Charts/Renderers/PieChartRenderer.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ open class PieChartRenderer: DataRenderer
130130
for j in 0 ..< entryCount
131131
{
132132
guard let e = dataSet.entryForIndex(j) else { continue }
133-
if ((abs(e.y) > DBL_EPSILON))
133+
if ((abs(e.y) > Double.ulpOfOne))
134134
{
135135
visibleAngleCount += 1
136136
}
@@ -148,7 +148,7 @@ open class PieChartRenderer: DataRenderer
148148
guard let e = dataSet.entryForIndex(j) else { continue }
149149

150150
// draw only if the value is greater than zero
151-
if (abs(e.y) > DBL_EPSILON)
151+
if (abs(e.y) > Double.ulpOfOne)
152152
{
153153
if !chart.needsHighlight(index: j)
154154
{
@@ -708,7 +708,7 @@ open class PieChartRenderer: DataRenderer
708708
for j in 0 ..< entryCount
709709
{
710710
guard let e = set.entryForIndex(j) else { continue }
711-
if ((abs(e.y) > DBL_EPSILON))
711+
if ((abs(e.y) > Double.ulpOfOne))
712712
{
713713
visibleAngleCount += 1
714714
}

‎Source/Charts/Utils/ChartUtils.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ open class ChartUtils
2222

2323
internal struct Math
2424
{
25-
internal static let FDEG2RAD = CGFloat(M_PI / 180.0)
26-
internal static let FRAD2DEG = CGFloat(180.0 / M_PI)
27-
internal static let DEG2RAD = M_PI / 180.0
28-
internal static let RAD2DEG = 180.0 / M_PI
25+
internal static let FDEG2RAD = CGFloat(Double.pi / 180.0)
26+
internal static let FRAD2DEG = CGFloat(180.0 / Double.pi)
27+
internal static let DEG2RAD = Double.pi / 180.0
28+
internal static let RAD2DEG = 180.0 / Double.pi
2929
}
3030

3131
internal class func roundToNextSignificant(number: Double) -> Double
@@ -67,7 +67,7 @@ open class ChartUtils
6767
}
6868
else
6969
{
70-
return number + DBL_EPSILON
70+
return number + Double.ulpOfOne
7171
}
7272
}
7373

‎Source/ChartsRealm/Data/RealmBarDataSet.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ open class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartDat
239239
return
240240
}
241241

242-
_yMax = -DBL_MAX
243-
_yMin = DBL_MAX
244-
_xMax = -DBL_MAX
245-
_xMin = DBL_MAX
242+
_yMax = -Double.greatestFiniteMagnitude
243+
_yMin = Double.greatestFiniteMagnitude
244+
_xMax = -Double.greatestFiniteMagnitude
245+
_xMin = Double.greatestFiniteMagnitude
246246

247247
for e in _cache as! [BarChartDataEntry]
248248
{

0 commit comments

Comments
 (0)