From dc0b74e07fad0a5f302166790e98eb3fc4f0f735 Mon Sep 17 00:00:00 2001 From: Tushar Maheshwari Date: Sun, 2 Oct 2016 23:31:24 +0530 Subject: [PATCH] Simplify Handle::initialize template parameter --- src/uvw/async.hpp | 2 +- src/uvw/check.hpp | 2 +- src/uvw/fs_event.hpp | 2 +- src/uvw/fs_poll.hpp | 2 +- src/uvw/handle.hpp | 4 ++-- src/uvw/idle.hpp | 2 +- src/uvw/pipe.hpp | 2 +- src/uvw/poll.hpp | 4 ++-- src/uvw/prepare.hpp | 2 +- src/uvw/signal.hpp | 2 +- src/uvw/tcp.hpp | 4 ++-- src/uvw/timer.hpp | 2 +- src/uvw/tty.hpp | 2 +- src/uvw/udp.hpp | 4 ++-- 14 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/uvw/async.hpp b/src/uvw/async.hpp index 40e93a20..7be97fea 100644 --- a/src/uvw/async.hpp +++ b/src/uvw/async.hpp @@ -53,7 +53,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_async_init, &sendCallback); + return initialize(&uv_async_init, &sendCallback); } /** diff --git a/src/uvw/check.hpp b/src/uvw/check.hpp index 1518f9d9..c437c634 100644 --- a/src/uvw/check.hpp +++ b/src/uvw/check.hpp @@ -49,7 +49,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_check_init); + return initialize(&uv_check_init); } /** diff --git a/src/uvw/fs_event.hpp b/src/uvw/fs_event.hpp index a7e6af65..3cc557d2 100644 --- a/src/uvw/fs_event.hpp +++ b/src/uvw/fs_event.hpp @@ -109,7 +109,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_fs_event_init); + return initialize(&uv_fs_event_init); } /** diff --git a/src/uvw/fs_poll.hpp b/src/uvw/fs_poll.hpp index 428ac144..7e5d642b 100644 --- a/src/uvw/fs_poll.hpp +++ b/src/uvw/fs_poll.hpp @@ -73,7 +73,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_fs_poll_init); + return initialize(&uv_fs_poll_init); } /** diff --git a/src/uvw/handle.hpp b/src/uvw/handle.hpp index 10e4e589..c4197199 100644 --- a/src/uvw/handle.hpp +++ b/src/uvw/handle.hpp @@ -43,10 +43,10 @@ protected: *buf = uv_buf_init(new char[suggested], suggested); } - template + template bool initialize(F &&f, Args&&... args) { if(!this->self()) { - auto err = std::forward(f)(this->parent(), this->template get(), std::forward(args)...); + auto err = std::forward(f)(this->parent(), this->get(), std::forward(args)...); if(err) { this->publish(ErrorEvent{err}); diff --git a/src/uvw/idle.hpp b/src/uvw/idle.hpp index da26198d..4bc6ee12 100644 --- a/src/uvw/idle.hpp +++ b/src/uvw/idle.hpp @@ -56,7 +56,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_idle_init); + return initialize(&uv_idle_init); } /** diff --git a/src/uvw/pipe.hpp b/src/uvw/pipe.hpp index 5259ff55..6f73e1f1 100644 --- a/src/uvw/pipe.hpp +++ b/src/uvw/pipe.hpp @@ -44,7 +44,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_pipe_init, ipc); + return initialize(&uv_pipe_init, ipc); } /** diff --git a/src/uvw/poll.hpp b/src/uvw/poll.hpp index 7814b019..35add995 100644 --- a/src/uvw/poll.hpp +++ b/src/uvw/poll.hpp @@ -109,8 +109,8 @@ public: */ bool init() { return (tag == SOCKET) - ? initialize(&uv_poll_init_socket, socket) - : initialize(&uv_poll_init, fd); + ? initialize(&uv_poll_init_socket, socket) + : initialize(&uv_poll_init, fd); } /** diff --git a/src/uvw/prepare.hpp b/src/uvw/prepare.hpp index b2a6d585..d5f1ddea 100644 --- a/src/uvw/prepare.hpp +++ b/src/uvw/prepare.hpp @@ -49,7 +49,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_prepare_init); + return initialize(&uv_prepare_init); } /** diff --git a/src/uvw/signal.hpp b/src/uvw/signal.hpp index 52773b97..85c1a750 100644 --- a/src/uvw/signal.hpp +++ b/src/uvw/signal.hpp @@ -65,7 +65,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_signal_init); + return initialize(&uv_signal_init); } /** diff --git a/src/uvw/tcp.hpp b/src/uvw/tcp.hpp index ce7733e8..71d14a71 100644 --- a/src/uvw/tcp.hpp +++ b/src/uvw/tcp.hpp @@ -73,8 +73,8 @@ public: */ bool init() { return (tag == FLAGS) - ? initialize(&uv_tcp_init_ex, flags) - : initialize(&uv_tcp_init); + ? initialize(&uv_tcp_init_ex, flags) + : initialize(&uv_tcp_init); } /** diff --git a/src/uvw/timer.hpp b/src/uvw/timer.hpp index a68d6831..0d656c08 100644 --- a/src/uvw/timer.hpp +++ b/src/uvw/timer.hpp @@ -51,7 +51,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_timer_init); + return initialize(&uv_timer_init); } /** diff --git a/src/uvw/tty.hpp b/src/uvw/tty.hpp index 8a847370..4c742a95 100644 --- a/src/uvw/tty.hpp +++ b/src/uvw/tty.hpp @@ -81,7 +81,7 @@ public: * @return True in case of success, false otherwise. */ bool init() { - return initialize(&uv_tty_init, fd, rw); + return initialize(&uv_tty_init, fd, rw); } /** diff --git a/src/uvw/udp.hpp b/src/uvw/udp.hpp index d81ed6a2..393abdb0 100644 --- a/src/uvw/udp.hpp +++ b/src/uvw/udp.hpp @@ -165,8 +165,8 @@ public: */ bool init() { return (tag == FLAGS) - ? initialize(&uv_udp_init_ex, flags) - : initialize(&uv_udp_init); + ? initialize(&uv_udp_init_ex, flags) + : initialize(&uv_udp_init); } /**