TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Net tests were failing to compile because 'static members' weren't actually being declared as members...

Browse source
This commit is contained in:
Thomas "elfprince13" Dickerson 2017-01-05 13:35:07 -05:00
parent 3f73bb99b9
commit 32f726dcc6
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/platform/platformNet.cpp
View file

@ -491,11 +491,10 @@ template<class T> T ReservedSocketList<T>::resolve(NetSocket socketToResolve)
EntryType &entry = mSocketList[socketToResolve.getHandle()]; EntryType &entry = mSocketList[socketToResolve.getHandle()];
return entry.used ? entry.value : -1; return entry.used ? entry.value : -1;
} }
ConnectionNotifyEvent* Net::smConnectionNotify = NULL;
static ConnectionNotifyEvent* smConnectionNotify = NULL; ConnectionAcceptedEvent* Net::smConnectionAccept = NULL;
static ConnectionAcceptedEvent* smConnectionAccept = NULL; ConnectionReceiveEvent* Net::smConnectionReceive = NULL;
static ConnectionReceiveEvent* smConnectionReceive = NULL; PacketReceiveEvent* Net::smPacketReceive = NULL;
static PacketReceiveEvent* smPacketReceive = NULL;
ConnectionNotifyEvent& Net::getConnectionNotifyEvent() ConnectionNotifyEvent& Net::getConnectionNotifyEvent()
{ {

6
Engine/source/platform/platformNet.h
View file

@ -214,6 +214,12 @@ struct Net
static bool smMulticastEnabled; static bool smMulticastEnabled;
static bool smIpv4Enabled; static bool smIpv4Enabled;
static bool smIpv6Enabled; static bool smIpv6Enabled;
static ConnectionNotifyEvent* smConnectionNotify;
static ConnectionAcceptedEvent* smConnectionAccept;
static ConnectionReceiveEvent* smConnectionReceive;
static PacketReceiveEvent* smPacketReceive;
static bool init(); static bool init();
static void shutdown(); static void shutdown();

16
Engine/source/platform/test/netTest.cpp
View file

@ -76,8 +76,8 @@ TEST(Net, TCPRequest)
handler.mDataReceived = 0; handler.mDataReceived = 0;
// Hook into the signals. // Hook into the signals.
Net::smConnectionNotify .notify(&handler, &TcpHandle::notify); Net::smConnectionNotify ->notify(&handler, &TcpHandle::notify);
Net::smConnectionReceive.notify(&handler, &TcpHandle::receive); Net::smConnectionReceive->notify(&handler, &TcpHandle::receive);
// Open a TCP connection to garagegames.com // Open a TCP connection to garagegames.com
handler.mSocket = Net::openConnectTo("72.246.107.193:80"); handler.mSocket = Net::openConnectTo("72.246.107.193:80");
@ -85,8 +85,8 @@ TEST(Net, TCPRequest)
while(Process::processEvents() && (Platform::getRealMilliseconds() < limit) ) {} while(Process::processEvents() && (Platform::getRealMilliseconds() < limit) ) {}
// Unhook from the signals. // Unhook from the signals.
Net::smConnectionNotify .remove(&handler, &TcpHandle::notify); Net::smConnectionNotify ->remove(&handler, &TcpHandle::notify);
Net::smConnectionReceive.remove(&handler, &TcpHandle::receive); Net::smConnectionReceive->remove(&handler, &TcpHandle::receive);
EXPECT_GT(handler.mDataReceived, 0) EXPECT_GT(handler.mDataReceived, 0)
<< "Didn't get any data back!"; << "Didn't get any data back!";
@ -139,8 +139,8 @@ struct JournalHandle
mDataReceived = 0; mDataReceived = 0;
// Hook into the signals. // Hook into the signals.
Net::smConnectionNotify .notify(this, &JournalHandle::notify); Net::smConnectionNotify ->notify(this, &JournalHandle::notify);
Net::smConnectionReceive.notify(this, &JournalHandle::receive); Net::smConnectionReceive->notify(this, &JournalHandle::receive);
// Open a TCP connection to garagegames.com // Open a TCP connection to garagegames.com
mSocket = Net::openConnectTo("72.246.107.193:80"); mSocket = Net::openConnectTo("72.246.107.193:80");
@ -149,8 +149,8 @@ struct JournalHandle
while(Process::processEvents()) {} while(Process::processEvents()) {}
// Unhook from the signals. // Unhook from the signals.
Net::smConnectionNotify .remove(this, &JournalHandle::notify); Net::smConnectionNotify ->remove(this, &JournalHandle::notify);
Net::smConnectionReceive.remove(this, &JournalHandle::receive); Net::smConnectionReceive->remove(this, &JournalHandle::receive);
EXPECT_GT(mDataReceived, 0) EXPECT_GT(mDataReceived, 0)
<< "Didn't get any data back!"; << "Didn't get any data back!";