Updated for Swift 3.0

Swift 3.0 Development 04-08-2016
PureSwift · Aug 6, 2016 · 8048cd2 · 8048cd2
1 parent bd8b7a5
commit 8048cd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Sources/SwiftFoundation/Data.swift b/Sources/SwiftFoundation/Data.swift
@@ -85,7 +85,7 @@
             guard let pointer = buffer.baseAddress
                 else { self.init(); return }
 
-            self.init(bytes: pointer, count: sizeof(SourceType.self) * buffer.count)
+            self.init(bytes: pointer, count: MemoryLayout<SourceType>.size * buffer.count)
         }
 
         // MARK: - Accessors

diff --git a/Sources/SwiftFoundation/Hash.swift b/Sources/SwiftFoundation/Hash.swift
@@ -10,5 +10,5 @@
 public func Hash(_ data: Data) -> Int {
 
     // more expensive than casting but that's not safe for large values.
-    return data.bytes.map({ Int($0) }).reduce(0, { $0.0 ^ $0.1 })
+    return data.bytes.map({ Int($0) }).reduce(0) { $0.0 ^ $0.1 }
 }
diff --git a/Sources/SwiftFoundation/JSONParse.swift b/Sources/SwiftFoundation/JSONParse.swift
@@ -27,7 +27,7 @@ public extension JSON.Value {
         // could not parse
         guard tokenerError != nil else { return nil }
 
-        self = self.dynamicType.init(jsonObject: jsonObject)
+        self.init(jsonObject: jsonObject)
     }
 }
 

diff --git a/Sources/SwiftFoundation/Thread.swift b/Sources/SwiftFoundation/Thread.swift
@@ -21,7 +21,7 @@ public final class Thread {
 
     // MARK: - Intialization
 
-    public init(_ closure: () -> ()) throws {
+    public init(_ closure: @escaping () -> ()) throws {
 
         let holder = Unmanaged.passRetained(Closure(closure: closure))
 
@@ -116,7 +116,7 @@ fileprivate extension Thread {
 
         let closure: () -> ()
 
-        init(closure: () -> ()) {
+        init(closure: @escaping () -> ()) {
 
             self.closure = closure
         }