Merge pull request #2 from LoganWright/05-31

updating to 05-31 snapshot
ketzusaka · Jun 2, 2016 · 952a1fa · 952a1fa
2 parents 9968b40 + 1202a31
commit 952a1fa
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 256 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .build
 .DS_Store
-Strand.xcodeproj/project.xcworkspace/xcuserdata
-Strand.xcodeproj/xcuserdata
+*.xcodeproj
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+DEVELOPMENT-SNAPSHOT-2016-05-31-a
diff --git a/Sources/Strand.swift b/Sources/Strand.swift
@@ -39,11 +39,7 @@ public class Strand {
 
  public init(closure: () -> Void) throws {
  let holder = Unmanaged.passRetained(StrandClosure(closure: closure))
- #if swift(>=3.0)
- let pointer = UnsafeMutablePointer<Void>(OpaquePointer(bitPattern: holder))
- #else
- let pointer = UnsafeMutablePointer<Void>(holder.toOpaque())
- #endif
+ let pointer = UnsafeMutablePointer<Void>(holder.toOpaque())
 
  #if swift(>=3.0)
  #if os(Linux)
@@ -96,7 +92,8 @@ public class Strand {
 
 #if swift(>=3.0)
 private func runner(arg: UnsafeMutablePointer<Void>?) -> UnsafeMutablePointer<Void>? {
- let unmanaged = Unmanaged<StrandClosure>.fromOpaque(OpaquePointer(arg!))
+ guard let arg = arg else { return nil }
+ let unmanaged = Unmanaged<StrandClosure>.fromOpaque(arg)
  unmanaged.takeUnretainedValue().closure()
  unmanaged.release()
  return nil

diff --git a/Strand.xcodeproj/project.pbxproj b/Strand.xcodeproj/project.pbxproj
diff --git a/Strand.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Strand.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Strand.xcodeproj/xcshareddata/xcschemes/Strand.xcscheme b/Strand.xcodeproj/xcshareddata/xcschemes/Strand.xcscheme
diff --git a/Strand.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist b/Strand.xcodeproj/xcshareddata/xcschemes/xcschememanagement.plist