diff --git a/src/uvw/request.hpp b/src/uvw/request.hpp index eee746a9..3b07ec58 100644 --- a/src/uvw/request.hpp +++ b/src/uvw/request.hpp @@ -22,8 +22,8 @@ protected: return ptr; } - template - static void defaultCallback(R *req, int status) { + template + static void defaultCallback(U *req, int status) { auto ptr = reserve(reinterpret_cast(req)); if(status) { ptr->publish(ErrorEvent{status}); } else { ptr->publish(E{}); } diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index 0ec02aa7..619db913 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -96,7 +96,7 @@ public: template void connect(F &&f, Args... args) { - invoke(std::forward(f), get(), std::forward(args)..., &defaultCallback); + invoke(std::forward(f), get(), std::forward(args)..., &defaultCallback); } }; @@ -110,7 +110,7 @@ public: } void shutdown(uv_stream_t *handle) { - invoke(&uv_shutdown, get(), handle, &defaultCallback); + invoke(&uv_shutdown, get(), handle, &defaultCallback); } }; @@ -124,11 +124,11 @@ public: } void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs) { - invoke(&uv_write, get(), handle, bufs, nbufs, &defaultCallback); + invoke(&uv_write, get(), handle, bufs, nbufs, &defaultCallback); } void write(uv_stream_t *handle, const uv_buf_t bufs[], unsigned int nbufs, uv_stream_t *send) { - invoke(&uv_write2, get(), handle, bufs, nbufs, send, &defaultCallback); + invoke(&uv_write2, get(), handle, bufs, nbufs, send, &defaultCallback); } }; diff --git a/src/uvw/udp.hpp b/src/uvw/udp.hpp index 393abdb0..b0a826bc 100644 --- a/src/uvw/udp.hpp +++ b/src/uvw/udp.hpp @@ -89,7 +89,7 @@ public: } void send(uv_udp_t *handle, const uv_buf_t bufs[], unsigned int nbufs, const struct sockaddr* addr) { - invoke(&uv_udp_send, get(), handle, bufs, nbufs, addr, &defaultCallback); + invoke(&uv_udp_send, get(), handle, bufs, nbufs, addr, &defaultCallback); } }; diff --git a/src/uvw/work.hpp b/src/uvw/work.hpp index 7b8f1260..9bdbabf4 100644 --- a/src/uvw/work.hpp +++ b/src/uvw/work.hpp @@ -64,7 +64,7 @@ public: * This request can be cancelled with `cancel()`. */ void queue() { - invoke(&uv_queue_work, parent(), get(), &workCallback, &defaultCallback); + invoke(&uv_queue_work, parent(), get(), &workCallback, &defaultCallback); } private: