mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-29 23:15:56 -04:00
Revert "newer standards prefer nullptr over NULL - this is most of them but there are others too"
This reverts commit 3e4cc36e7e.
This commit is contained in:
+4
-4
@@ -27,8 +27,8 @@ unsigned int SharedRemoteDebugServer::ms_remoteDebugToolChanne
|
||||
|
||||
void SharedRemoteDebugServer::install()
|
||||
{
|
||||
ms_serviceHandle = nullptr;
|
||||
ms_connection = nullptr;
|
||||
ms_serviceHandle = NULL;
|
||||
ms_connection = NULL;
|
||||
|
||||
if (!ConfigSharedFoundation::getUseRemoteDebug())
|
||||
return;
|
||||
@@ -41,7 +41,7 @@ void SharedRemoteDebugServer::install()
|
||||
ms_serviceHandle = new Service(ConnectionAllocator<SharedRemoteDebugServerConnection>(), setup);
|
||||
|
||||
//even though this is the game client, this is a remoteDebug *server*, since it sends data to a Qt app for viewing
|
||||
RemoteDebugServer::install(nullptr, open, close, send, nullptr);
|
||||
RemoteDebugServer::install(NULL, open, close, send, NULL);
|
||||
|
||||
//this value needs to be true before the call to RemoteDebugServer::open
|
||||
ms_installed = true;
|
||||
@@ -84,7 +84,7 @@ void SharedRemoteDebugServer::close(void)
|
||||
{
|
||||
DEBUG_FATAL(!ms_installed, ("sharedRemoteDebugServer not installed"));
|
||||
delete ms_connection;
|
||||
ms_connection = nullptr;
|
||||
ms_connection = NULL;
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -16,7 +16,7 @@
|
||||
|
||||
SharedRemoteDebugServerConnection::SharedRemoteDebugServerConnection(const std::string & a, const unsigned short p) :
|
||||
Connection(a, p, NetworkSetupData()),
|
||||
m_remotedebugCommandChannel (nullptr)
|
||||
m_remotedebugCommandChannel (NULL)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ m_remotedebugCommandChannel (nullptr)
|
||||
|
||||
SharedRemoteDebugServerConnection::SharedRemoteDebugServerConnection(UdpConnectionMT * u, TcpClient * t) :
|
||||
Connection(u, t),
|
||||
m_remotedebugCommandChannel (nullptr)
|
||||
m_remotedebugCommandChannel (NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user