Merge branch 'master' of github.com:kentonv/capnproto

c++/src/capnp/ez-rpc.c++

@@ -114,7 +114,7 @@ struct EzRpcClient::Impl {
               clientContext = kj::heap<ClientContext>(kj::mv(stream));
             }).fork()) {}
 
-  Impl(struct sockaddr* serverAddress, uint addrSize)
+  Impl(const struct sockaddr* serverAddress, uint addrSize)
       : context(EzRpcContext::getThreadLocal()),
         setupPromise(context->getIoProvider().getNetwork()
             .getSockaddr(serverAddress, addrSize)->connect()
@@ -132,7 +132,7 @@ struct EzRpcClient::Impl {
 EzRpcClient::EzRpcClient(kj::StringPtr serverAddress, uint defaultPort)
     : impl(kj::heap<Impl>(serverAddress, defaultPort)) {}
 
-EzRpcClient::EzRpcClient(struct sockaddr* serverAddress, uint addrSize)
+EzRpcClient::EzRpcClient(const struct sockaddr* serverAddress, uint addrSize)
     : impl(kj::heap<Impl>(serverAddress, addrSize)) {}
 
 EzRpcClient::EzRpcClient(int socketFd)

c++/src/capnp/ez-rpc.h

@@ -26,6 +26,8 @@
 
 #include "rpc.h"
 
+struct sockaddr;
+
 namespace kj { class AsyncIoProvider; class LowLevelAsyncIoProvider; }
 
 namespace capnp {
@@ -102,7 +104,7 @@ public:
   // The address is parsed by `kj::Network` in `kj/async-io.h`.  See that interface for more info
   // on the address format, but basically it's what you'd expect.
 
-  EzRpcClient(struct sockaddr* serverAddress, uint addrSize);
+  EzRpcClient(const struct sockaddr* serverAddress, uint addrSize);
   // Like the above constructor, but connects to an already-resolved socket address.  Any address
   // format supported by `kj::Network` in `kj/async-io.h` is accepted.