From 55d7d9020984a1a385a7adb6890cbc49f10b6bc2 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Thu, 23 Jan 2020 02:35:36 +0100 Subject: [PATCH] windows: Fix accidental rename --- source/windows/server.cpp | 4 ++-- source/windows/socket.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/windows/server.cpp b/source/windows/server.cpp index 897b03d..bd8774d 100644 --- a/source/windows/server.cpp +++ b/source/windows/server.cpp @@ -152,7 +152,7 @@ void datapath::windows::server::_watcher() std::unique_lock ul(this->lock); std::list to_kill; - if (this->_on_accept) { + if (this->on_accept) { for (auto itr = this->pending_sockets.begin(); itr != this->pending_sockets.end(); itr++) { HANDLE handle = *itr; bool accept = true; @@ -161,7 +161,7 @@ void datapath::windows::server::_watcher() sock->_connect(handle); auto isock = std::dynamic_pointer_cast(sock); - this->_on_accept(accept, isock); + this->on_accept(accept, isock); if (accept) { to_kill.push_back(handle); diff --git a/source/windows/socket.cpp b/source/windows/socket.cpp index 60791ef..f766985 100644 --- a/source/windows/socket.cpp +++ b/source/windows/socket.cpp @@ -39,8 +39,8 @@ void datapath::windows::socket::_connect(HANDLE handle) void datapath::windows::socket::_disconnect() { - if (this->_on_close) { - this->_on_close(); + if (this->on_close) { + this->on_close(); } { @@ -96,8 +96,8 @@ void datapath::windows::socket::_watcher() }); read_content_ov->_on_wait_success.add([this, &read_buffer, &state, &waitable](datapath::error ec) { // We have content! - if (this->_on_message) { - this->_on_message(read_buffer); + if (this->on_message) { + this->on_message(read_buffer); state = readstate::Unknown; } else { // We're buffering the message in read_buffer until there is a hook to on_message. @@ -138,8 +138,8 @@ void datapath::windows::socket::_watcher() // This logic is in the on_wait_success handler, and continued here. if (!waitable) { // We currently have a message buffered, but there was no handler last time we checked. - if (this->_on_message) { - this->_on_message(read_buffer); + if (this->on_message) { + this->on_message(read_buffer); state = readstate::Unknown; } }