From 573fe425d7030d7aadc9149c8ff45c177798cd5c Mon Sep 17 00:00:00 2001 From: puvvadar Date: Mon, 2 Aug 2021 20:34:39 -0700 Subject: [PATCH] Also rename some variables to match renamed timeout funcs Signed-off-by: puvvadar --- .../AzNetworking/TcpTransport/TcpNetworkInterface.cpp | 6 +++--- .../AzNetworking/TcpTransport/TcpNetworkInterface.h | 4 ++-- .../AzNetworking/UdpTransport/UdpNetworkInterface.cpp | 6 +++--- .../AzNetworking/UdpTransport/UdpNetworkInterface.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp index 26972cfa0b..52c696b663 100644 --- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp +++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.cpp @@ -174,14 +174,14 @@ namespace AzNetworking return connection->Disconnect(reason, TerminationEndpoint::Local); } - void TcpNetworkInterface::SetTimeoutEnabled(bool doesTimeout) + void TcpNetworkInterface::SetTimeoutEnabled(bool timeoutEnabled) { - m_doesTimeout = doesTimeout; + m_timeoutEnabled = timeoutEnabled; } bool TcpNetworkInterface::IsTimeoutEnabled() { - return m_doesTimeout; + return m_timeoutEnabled; } void TcpNetworkInterface::QueueNewConnection(const PendingConnection& pendingConnection) diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h index f041f707be..3eb792bc7f 100644 --- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h +++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpNetworkInterface.h @@ -99,7 +99,7 @@ namespace AzNetworking bool WasPacketAcked(ConnectionId connectionId, PacketId packetId) override; bool StopListening() override; bool Disconnect(ConnectionId connectionId, DisconnectReason reason) override; - void SetTimeoutEnabled(bool doesTimeout) override; + void SetTimeoutEnabled(bool timeoutEnabled) override; bool IsTimeoutEnabled() override; //! @} @@ -156,7 +156,7 @@ namespace AzNetworking AZ::Name m_name; TrustZone m_trustZone; uint16_t m_port = 0; - bool m_doesTimeout = true; + bool m_timeoutEnabled = true; IConnectionListener& m_connectionListener; TcpConnectionSet m_connectionSet; TcpSocketManager m_tcpSocketManager; diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp index 6be01d84ed..a80cb82d03 100644 --- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp +++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp @@ -397,14 +397,14 @@ namespace AzNetworking return connection->Disconnect(reason, TerminationEndpoint::Local); } - void UdpNetworkInterface::SetTimeoutEnabled(bool doesTimeout) + void UdpNetworkInterface::SetTimeoutEnabled(bool timeoutEnabled) { - m_doesTimeout = doesTimeout; + m_timeoutEnabled = timeoutEnabled; } bool UdpNetworkInterface::IsTimeoutEnabled() { - return m_doesTimeout; + return m_timeoutEnabled; } bool UdpNetworkInterface::IsEncrypted() const diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h index 087ed9d52f..0260491295 100644 --- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h +++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.h @@ -104,7 +104,7 @@ namespace AzNetworking bool WasPacketAcked(ConnectionId connectionId, PacketId packetId) override; bool StopListening() override; bool Disconnect(ConnectionId connectionId, DisconnectReason reason) override; - void SetTimeoutEnabled(bool doesTimeout) override; + void SetTimeoutEnabled(bool timeoutEnabled) override; bool IsTimeoutEnabled() override; //! @} @@ -181,7 +181,7 @@ namespace AzNetworking TrustZone m_trustZone; uint16_t m_port = 0; bool m_allowIncomingConnections = false; - bool m_doesTimeout = true; + bool m_timeoutEnabled = true; IConnectionListener& m_connectionListener; UdpConnectionSet m_connectionSet; TimeoutQueue m_connectionTimeoutQueue;