Browse Source

updates for Xcode 8 beta 6

Tim Burks 9 years ago
parent
commit
3a1982e2c9

+ 2 - 2
Packages/gRPC/Sources/ByteBuffer.swift

@@ -39,12 +39,12 @@ import Foundation // for String.Encoding
 public class ByteBuffer {
 
   /// Pointer to underlying C representation
-  var b: UnsafeMutablePointer<Void>
+  var b: UnsafeMutableRawPointer
 
   /// Initializes a ByteBuffer
   ///
   /// - Parameter b: the underlying C representation
-  init(b: UnsafeMutablePointer<Void>) {
+  init(b: UnsafeMutableRawPointer) {
     self.b = b
   }
 

+ 4 - 4
Packages/gRPC/Sources/Call.swift

@@ -36,7 +36,7 @@
 
 /// Singleton class that provides a mutex for synchronizing calls to cgrpc_call_perform()
 private class CallLock {
-  private var mutex : Mutex
+  var mutex : Mutex
   init() {
     mutex = Mutex()
   }
@@ -47,7 +47,7 @@ private class CallLock {
 public class Call {
 
   /// Pointer to underlying C representation
-  private var call : UnsafeMutablePointer<Void>!
+  private var call : UnsafeMutableRawPointer!
 
   /// True if this instance is responsible for deleting the underlying C representation
   private var owned : Bool
@@ -56,13 +56,13 @@ public class Call {
   ///
   /// - Parameter call: the underlying C representation
   /// - Parameter owned: true if this instance is responsible for deleting the underlying call
-  init(call: UnsafeMutablePointer<Void>, owned: Bool) {
+  init(call: UnsafeMutableRawPointer, owned: Bool) {
     self.call = call
     self.owned = owned
   }
 
   // coming soon
-  init(call: UnsafeMutablePointer<Void>,
+  init(call: UnsafeMutableRawPointer,
        requestsWriter: Writer,
        responsesWritable: Writable) {
     self.call = call

+ 1 - 1
Packages/gRPC/Sources/Client.swift

@@ -38,7 +38,7 @@
 public class Client {
 
   /// Pointer to underlying C representation
-  var c: UnsafeMutablePointer<Void>!
+  var c: UnsafeMutableRawPointer!
 
   /// Completion queue for client call operations
   var completionQueue: CompletionQueue

+ 2 - 2
Packages/gRPC/Sources/CompletionQueue.swift

@@ -38,12 +38,12 @@
 public class CompletionQueue {
 
   /// Pointer to underlying C representation
-  var cq : UnsafeMutablePointer<Void>!
+  var cq : UnsafeMutableRawPointer!
 
   /// Initializes a CompletionQueue
   ///
   /// - Parameter cq: the underlying C representation
-  init(cq: UnsafeMutablePointer<Void>) {
+  init(cq: UnsafeMutableRawPointer) {
     self.cq = cq // NOT OWNED, so we don't dealloc it
   }
 

+ 2 - 2
Packages/gRPC/Sources/Handler.swift

@@ -38,7 +38,7 @@ import Foundation // for String.Encoding
 /// A gRPC request handler
 public class Handler {
   /// Pointer to underlying C representation
-  var h: UnsafeMutablePointer<Void>!
+  var h: UnsafeMutableRawPointer!
 
   /// Completion queue for handler response operations
   var completionQueue: CompletionQueue
@@ -49,7 +49,7 @@ public class Handler {
   /// Initializes a Handler
   ///
   /// - Parameter h: the underlying C representation
-  init(h:UnsafeMutablePointer<Void>!) {
+  init(h:UnsafeMutableRawPointer!) {
     self.h = h;
     self.requestMetadata = Metadata()
     self.completionQueue = CompletionQueue(cq:cgrpc_handler_get_completion_queue(h))

+ 2 - 2
Packages/gRPC/Sources/Metadata.swift

@@ -49,9 +49,9 @@ public struct MetadataPair {
 public class Metadata {
 
   /// Pointer to underlying C representation
-  var array: UnsafeMutablePointer<Void>
+  var array: UnsafeMutableRawPointer
 
-  init(array: UnsafeMutablePointer<Void>) {
+  init(array: UnsafeMutableRawPointer) {
     self.array = array
   }
 

+ 1 - 1
Packages/gRPC/Sources/Mutex.swift

@@ -38,7 +38,7 @@
 public class Mutex {
 
   /// Pointer to underlying C representation
-  private var mu: UnsafeMutablePointer<Void>!
+  private var mu: UnsafeMutableRawPointer!
 
   /// Initializes a Mutex
   public init() {

+ 2 - 2
Packages/gRPC/Sources/Operation.swift

@@ -39,12 +39,12 @@ import Foundation // for String.Encoding
 public class Operation {
 
   /// Pointer to underlying C representation
-  var observer: UnsafeMutablePointer<Void>
+  var observer: UnsafeMutableRawPointer
 
   /// Initializes an Operation Observer
   ///
   /// - Parameter observer: the underlying C representation
-  private init(observer: UnsafeMutablePointer<Void>) {
+  init(observer: UnsafeMutableRawPointer) {
     self.observer = observer
   }
 

+ 1 - 1
Packages/gRPC/Sources/Server.swift

@@ -38,7 +38,7 @@
 public class Server {
 
   /// Pointer to underlying C representation
-  var s: UnsafeMutablePointer<Void>!
+  var s: UnsafeMutableRawPointer!
 
   /// Completion queue used for server operations
   var completionQueue: CompletionQueue