Quick fix for conflicting commits.

atrick · atrick · commit dd9e4385c7f6 · 2016-07-26T15:30:12.000-07:00
diff --git a/Foundation/NSJSONSerialization.swift b/Foundation/NSJSONSerialization.swift
@@ -161,7 +161,8 @@ public class JSONSerialization : NSObject {
     public class func writeJSONObject(_ obj: AnyObject, toStream stream: NSOutputStream, options opt: WritingOptions) throws -> Int {
             let jsonData = try data(withJSONObject: obj, options: opt)
             let jsonNSData = jsonData.bridge()
-            return stream.write(UnsafeMutablePointer<UInt8>(jsonNSData.bytes), maxLength: jsonNSData.length)
+            let bytePtr = jsonNSData.bytes.bindMemory(to: UInt8.self, capacity: jsonNSData.length)
+            return stream.write(bytePtr, maxLength: jsonNSData.length)
     }
     
     /* Create a JSON object from JSON data stream. The stream should be opened and configured. All other behavior of this method is the same as the JSONObjectWithData:options:error: method.

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@ public class JSONSerialization : NSObject {`
`161`	`161`	`public class func writeJSONObject(_ obj: AnyObject, toStream stream: NSOutputStream, options opt: WritingOptions) throws -> Int {`
`162`	`162`	`let jsonData = try data(withJSONObject: obj, options: opt)`
`163`	`163`	`let jsonNSData = jsonData.bridge()`
`164`		`- return stream.write(UnsafeMutablePointer<UInt8>(jsonNSData.bytes), maxLength: jsonNSData.length)`
	`164`	`+ let bytePtr = jsonNSData.bytes.bindMemory(to: UInt8.self, capacity: jsonNSData.length)`
	`165`	`+ return stream.write(bytePtr, maxLength: jsonNSData.length)`
`165`	`166`	`}`
`166`	`167`
`167`	`168`	`/* Create a JSON object from JSON data stream. The stream should be opened and configured. All other behavior of this method is the same as the JSONObjectWithData:options:error: method.`