swift 5 fixes

vapor · Mar 26, 2019 · 314d9cd · 314d9cd
1 parent 4f5e173
commit 314d9cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Sources/SQLite/Database/SQLiteStatement.swift b/Sources/SQLite/Database/SQLiteStatement.swift
@@ -24,8 +24,9 @@ internal struct SQLiteStatement {
             switch bind {
             case .blob(let value):
                 let count = Int32(value.count)
-                let pointer: UnsafePointer<UInt8> = value.withUnsafeBytes { $0 }
-                let ret = sqlite3_bind_blob(c, i, UnsafeRawPointer(pointer), count, SQLITE_TRANSIENT)
+                let ret = value.withUnsafeBytes { pointer in
+                    return sqlite3_bind_blob(c, i, UnsafeRawPointer(pointer), count, SQLITE_TRANSIENT)
+                }
                 guard ret == SQLITE_OK else {
                     throw SQLiteError(statusCode: ret, connection: connection, source: .capture())
                 }

diff --git a/Sources/SQLite/Row/SQLiteColumn.swift b/Sources/SQLite/Row/SQLiteColumn.swift
@@ -33,8 +33,21 @@ extension SQLiteColumn: ExpressibleByStringLiteral {
 }
 
 extension SQLiteColumn: Hashable {
+    // #if compiler(>=4.2)
+    #if swift(>=4.1.50)
+    /// See `Hashable`.
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(self._hashValue)
+    }
+    #else
     /// See `Hashable`.
     public var hashValue: Int {
+        return self._hashValue
+    }
+    #endif
+
+    /// See `Hashable`.
+    private var _hashValue: Int {
         if let table = table {
             return table.hashValue &+ name.hashValue
         } else {