diff --git a/src/uvw/tcp.hpp b/src/uvw/tcp.hpp index d86dafce..e8c22867 100644 --- a/src/uvw/tcp.hpp +++ b/src/uvw/tcp.hpp @@ -72,10 +72,10 @@ public: * The passed file descriptor or SOCKET is not checked for its type, but * it’s required that it represents a valid stream socket. * - * @param sock A valid socket handle (either a file descriptor or a SOCKET). + * @param socket A valid socket handle (either a file descriptor or a SOCKET). */ - void open(OSSocketHandle _sock) { - invoke(&uv_tcp_open, get(), _sock); + void open(OSSocketHandle socket) { + invoke(&uv_tcp_open, get(), socket); } /** @@ -133,10 +133,10 @@ public: * @param flags Optional additional flags. */ template - void bind(std::string ip, unsigned int port, Flags _flags = Flags{}) { + void bind(std::string ip, unsigned int port, Flags opts = Flags{}) { typename details::IpTraits::Type addr; details::IpTraits::addrFunc(ip.data(), port, &addr); - invoke(&uv_tcp_bind, get(), reinterpret_cast(&addr), _flags); + invoke(&uv_tcp_bind, get(), reinterpret_cast(&addr), opts); } /** @@ -156,8 +156,8 @@ public: * @param flags Optional additional flags. */ template - void bind(Addr addr, Flags _flags = Flags{}) { - bind(addr.ip, addr.port, _flags); + void bind(Addr addr, Flags opts = Flags{}) { + bind(addr.ip, addr.port, opts); } /** @@ -197,10 +197,10 @@ public: ptr->publish(event); }; - auto _connect = loop().resource(); - _connect->once(listener); - _connect->once(listener); - _connect->connect(&uv_tcp_connect, get(), reinterpret_cast(&addr)); + auto req = loop().resource(); + req->once(listener); + req->once(listener); + req->connect(&uv_tcp_connect, get(), reinterpret_cast(&addr)); } /**