From 32f726dcc6727bcba04b5e30e571bdf63b1fbc3c Mon Sep 17 00:00:00 2001 From: "Thomas \"elfprince13\" Dickerson" Date: Thu, 5 Jan 2017 13:35:07 -0500 Subject: [PATCH] Net tests were failing to compile because 'static members' weren't actually being declared as members... --- Engine/source/platform/platformNet.cpp | 9 ++++----- Engine/source/platform/platformNet.h | 6 ++++++ Engine/source/platform/test/netTest.cpp | 16 ++++++++-------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Engine/source/platform/platformNet.cpp b/Engine/source/platform/platformNet.cpp index 4d5b6ca18..b598b96a6 100644 --- a/Engine/source/platform/platformNet.cpp +++ b/Engine/source/platform/platformNet.cpp @@ -491,11 +491,10 @@ template T ReservedSocketList::resolve(NetSocket socketToResolve) EntryType &entry = mSocketList[socketToResolve.getHandle()]; return entry.used ? entry.value : -1; } - -static ConnectionNotifyEvent* smConnectionNotify = NULL; -static ConnectionAcceptedEvent* smConnectionAccept = NULL; -static ConnectionReceiveEvent* smConnectionReceive = NULL; -static PacketReceiveEvent* smPacketReceive = NULL; +ConnectionNotifyEvent* Net::smConnectionNotify = NULL; +ConnectionAcceptedEvent* Net::smConnectionAccept = NULL; +ConnectionReceiveEvent* Net::smConnectionReceive = NULL; +PacketReceiveEvent* Net::smPacketReceive = NULL; ConnectionNotifyEvent& Net::getConnectionNotifyEvent() { diff --git a/Engine/source/platform/platformNet.h b/Engine/source/platform/platformNet.h index 1ffb780e9..4e8de1d70 100644 --- a/Engine/source/platform/platformNet.h +++ b/Engine/source/platform/platformNet.h @@ -214,6 +214,12 @@ struct Net static bool smMulticastEnabled; static bool smIpv4Enabled; static bool smIpv6Enabled; + + static ConnectionNotifyEvent* smConnectionNotify; + static ConnectionAcceptedEvent* smConnectionAccept; + static ConnectionReceiveEvent* smConnectionReceive; + static PacketReceiveEvent* smPacketReceive; + static bool init(); static void shutdown(); diff --git a/Engine/source/platform/test/netTest.cpp b/Engine/source/platform/test/netTest.cpp index 889d150f2..741e89ce0 100644 --- a/Engine/source/platform/test/netTest.cpp +++ b/Engine/source/platform/test/netTest.cpp @@ -76,8 +76,8 @@ TEST(Net, TCPRequest) handler.mDataReceived = 0; // Hook into the signals. - Net::smConnectionNotify .notify(&handler, &TcpHandle::notify); - Net::smConnectionReceive.notify(&handler, &TcpHandle::receive); + Net::smConnectionNotify ->notify(&handler, &TcpHandle::notify); + Net::smConnectionReceive->notify(&handler, &TcpHandle::receive); // Open a TCP connection to garagegames.com handler.mSocket = Net::openConnectTo("72.246.107.193:80"); @@ -85,8 +85,8 @@ TEST(Net, TCPRequest) while(Process::processEvents() && (Platform::getRealMilliseconds() < limit) ) {} // Unhook from the signals. - Net::smConnectionNotify .remove(&handler, &TcpHandle::notify); - Net::smConnectionReceive.remove(&handler, &TcpHandle::receive); + Net::smConnectionNotify ->remove(&handler, &TcpHandle::notify); + Net::smConnectionReceive->remove(&handler, &TcpHandle::receive); EXPECT_GT(handler.mDataReceived, 0) << "Didn't get any data back!"; @@ -139,8 +139,8 @@ struct JournalHandle mDataReceived = 0; // Hook into the signals. - Net::smConnectionNotify .notify(this, &JournalHandle::notify); - Net::smConnectionReceive.notify(this, &JournalHandle::receive); + Net::smConnectionNotify ->notify(this, &JournalHandle::notify); + Net::smConnectionReceive->notify(this, &JournalHandle::receive); // Open a TCP connection to garagegames.com mSocket = Net::openConnectTo("72.246.107.193:80"); @@ -149,8 +149,8 @@ struct JournalHandle while(Process::processEvents()) {} // Unhook from the signals. - Net::smConnectionNotify .remove(this, &JournalHandle::notify); - Net::smConnectionReceive.remove(this, &JournalHandle::receive); + Net::smConnectionNotify ->remove(this, &JournalHandle::notify); + Net::smConnectionReceive->remove(this, &JournalHandle::receive); EXPECT_GT(mDataReceived, 0) << "Didn't get any data back!";