Fix: Resolve deprecation warnings for swift 4.1 (#33)

Resolved deprecation warnings for swift 4.1 and added swift4.1 checks.
Kitura · Mar 22, 2018 · 09c030f · 09c030f
1 parent 05b6ae1
commit 09c030f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Sources/KituraWebSocket/WSFrame.swift b/Sources/KituraWebSocket/WSFrame.swift
@@ -50,7 +50,11 @@ struct WSFrame {
                 payloadLengthUInt16 = CFSwapInt16HostToBig(tempPayloadLengh)
             #endif
             let asBytes = UnsafeMutablePointer(&payloadLengthUInt16)
-            (UnsafeMutableRawPointer(mutating: bytes)+length+1).copyBytes(from: asBytes, count: 2)
+            #if swift(>=4.1)
+                (UnsafeMutableRawPointer(mutating: bytes)+length+1).copyMemory(from: asBytes, byteCount: 2)
+            #else
+                (UnsafeMutableRawPointer(mutating: bytes)+length+1).copyBytes(from: asBytes, count: 2)
+            #endif
             length += 3
         } else {
             bytes[1] = 127
@@ -62,7 +66,11 @@ struct WSFrame {
                 payloadLengthUInt32 = CFSwapInt32HostToBig(tempPayloadLengh)
             #endif
             let asBytes = UnsafeMutablePointer(&payloadLengthUInt32)
-            (UnsafeMutableRawPointer(mutating: bytes)+length+5).copyBytes(from: asBytes, count: 4)
+            #if swift(>=4.1)
+                (UnsafeMutableRawPointer(mutating: bytes)+length+5).copyMemory(from: asBytes, byteCount: 4)
+            #else
+                (UnsafeMutableRawPointer(mutating: bytes)+length+5).copyBytes(from: asBytes, count: 4)
+            #endif
             length += 9
         }
         buffer.append(bytes, length: length)

diff --git a/Sources/KituraWebSocket/WSFrameParser.swift b/Sources/KituraWebSocket/WSFrameParser.swift
@@ -140,7 +140,11 @@ struct WSFrameParser {
 
         if bytesConsumed > 0 {
             if length - from - bytesConsumed >= maskSize {
-                UnsafeMutableRawPointer(mutating: mask).copyBytes(from: bytes+from+bytesConsumed, count: maskSize)
+                #if swift(>=4.1)
+                    UnsafeMutableRawPointer(mutating: mask).copyMemory(from: bytes+from+bytesConsumed, byteCount: maskSize)
+                #else
+                    UnsafeMutableRawPointer(mutating: mask).copyBytes(from: bytes+from+bytesConsumed, count: maskSize)
+                #endif
                 bytesConsumed += maskSize
             }
             else {