Merge pull request #2481 from apple/coregraphics-cgfloat-from-cgfloat

swift-ci · swift-ci · commit 274ff905c546 · 2016-05-11T14:16:19.000-07:00
diff --git a/stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb b/stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb
@@ -46,6 +46,11 @@ public struct CGFloat {
     self.native = NativeType(value)
   }
 
+  @_transparent
+  public init(_ value: CGFloat) {
+    self = value
+  }
+
   /// The native value.
   public var native: NativeType
 }
diff --git a/stdlib/public/SDK/SceneKit/SceneKit.swift b/stdlib/public/SDK/SceneKit/SceneKit.swift
@@ -15,9 +15,6 @@
 // MARK: Exposing SCNFloat
 
 #if os(OSX)
-private extension CGFloat {
-   init(_ x: CGFloat) { self = x }
-}
 public typealias SCNFloat = CGFloat
 #elseif os(iOS) || os(tvOS)
 public typealias SCNFloat = Float
diff --git a/test/Interpreter/SDK/CoreGraphics_CGFloat.swift b/test/Interpreter/SDK/CoreGraphics_CGFloat.swift
@@ -21,6 +21,7 @@ CGFloatTestSuite.test("init") {
   expectEqual(0.0, CGFloat())
   expectEqual(4.125, CGFloat(Float(4.125)))
   expectEqual(4.125, CGFloat(Double(4.125)))
+  expectEqual(4.125, CGFloat(CGFloat(Double(4.125))))
 
   expectEqual(42, CGFloat(Int(42)))
   expectEqual(42, CGFloat(Int8(42)))

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,11 @@ public struct CGFloat {`
`46`	`46`	`self.native = NativeType(value)`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ @_transparent`
	`50`	`+ public init(_ value: CGFloat) {`
	`51`	`+ self = value`
	`52`	`+ }`
	`53`	`+`
`49`	`54`	`/// The native value.`
`50`	`55`	`public var native: NativeType`
`51`	`56`	`}`