Fix compatibility with Linux

Fixes #12.
postmates · Mar 6, 2017 · c2f0a20 · c2f0a20
1 parent d968ee5
commit c2f0a20
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Sources/Accessors.swift b/Sources/Accessors.swift
@@ -313,7 +313,7 @@ internal func convertDoubleToInt64(_ d: Double) -> Int64? {
         return NSDecimalNumber(decimal: d).int64Value
     }
 #else
-    internal func convertDecimalToInt64(_ d: ()) -> Int64? {
+    internal func convertDecimalToInt64(_ d: DecimalPlaceholder) -> Int64? {
         return nil
     }
 #endif
diff --git a/Sources/JSON.swift b/Sources/JSON.swift
@@ -16,7 +16,11 @@
     import struct Foundation.Decimal
 #else
     /// A placeholder used for platforms that don't support `Decimal`.
-    public typealias DecimalPlaceholder = ()
+    public struct DecimalPlaceholder: Equatable {
+        public static func ==(lhs: DecimalPlaceholder, rhs: DecimalPlaceholder) -> Bool {
+            return true
+        }
+    }
 #endif
 
 /// A single JSON-compatible value.

diff --git a/Sources/JSONError.swift b/Sources/JSONError.swift
@@ -1764,7 +1764,6 @@ internal func getRequired(_ ary: JSONArray, index: Int, type: JSONError.JSONType
     return value
 }
 
-@inline(__always)
 internal func scoped<T>(_ key: String, _ f: () throws -> T) rethrows -> T {
     do {
         return try f()
@@ -1773,7 +1772,6 @@ internal func scoped<T>(_ key: String, _ f: () throws -> T) rethrows -> T {
     }
 }
 
-@inline(__always)
 internal func scoped<T>(_ index: Int, _ f: () throws -> T) rethrows -> T {
     do {
         return try f()

diff --git a/Sources/Parser.swift b/Sources/Parser.swift
@@ -395,7 +395,7 @@ public struct JSONParserIterator<Iter: IteratorProtocol>: JSONEventIterator wher
                 }
             #endif
             /// Invoke this after parsing the "e" character.
-            @inline(__always) func parseExponent() throws -> JSONEvent {
+            func parseExponent() throws -> JSONEvent {
                 let c = try bumpRequired()
                 tempBuffer.append(Int8(truncatingBitPattern: c.value))
                 switch c {
@@ -420,7 +420,7 @@ public struct JSONParserIterator<Iter: IteratorProtocol>: JSONEventIterator wher
                     }
                 #endif
                 tempBuffer.append(0)
-                return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress, nil)}))
+                return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress!, nil)}))
             }
             outerLoop: while let c = base.peek() {
                 switch c {
@@ -451,7 +451,7 @@ public struct JSONParserIterator<Iter: IteratorProtocol>: JSONEventIterator wher
                         }
                     #endif
                     tempBuffer.append(0)
-                    return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress, nil)}))
+                    return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress!, nil)}))
                 case "e", "E":
                     bump()
                     tempBuffer.append(Int8(truncatingBitPattern: c.value))
@@ -466,7 +466,7 @@ public struct JSONParserIterator<Iter: IteratorProtocol>: JSONEventIterator wher
             tempBuffer.append(0)
             let num = tempBuffer.withUnsafeBufferPointer({ ptr -> Int64? in
                 errno = 0
-                let n = strtoll(ptr.baseAddress, nil, 10)
+                let n = strtoll(ptr.baseAddress!, nil, 10)
                 if n == 0 && errno != 0 {
                     return nil
                 } else {
@@ -483,7 +483,7 @@ public struct JSONParserIterator<Iter: IteratorProtocol>: JSONEventIterator wher
                     return try .decimalValue(tempBuffer.withUnsafeBufferPointer(parseDecimal(from:)))
                 }
             #endif
-            return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress, nil)}))
+            return .doubleValue(tempBuffer.withUnsafeBufferPointer({strtod($0.baseAddress!, nil)}))
         case "t":
             let line = self.line, column = self.column
             guard case "r"? = bump(), case "u"? = bump(), case "e"? = bump() else {