swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-30 00:15:47 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/MessageToManager.cpp
+5 -5
View File
@@ -16,7 +16,7 @@
// ======================================================================
MessageToManager *MessageToManager::ms_instance=NULL;
MessageToManager *MessageToManager::ms_instance=nullptr;
// ======================================================================
@@ -34,7 +34,7 @@ void MessageToManager::remove()
{
NOT_NULL(ms_instance);
delete ms_instance;
ms_instance = NULL;
ms_instance = nullptr;
}
// ----------------------------------------------------------------------
@@ -51,7 +51,7 @@ MessageToManager::~MessageToManager()
for (MessagesByObjectType::iterator i=m_messagesByObject.begin(); i!=m_messagesByObject.end(); ++i)
{
delete i->second;
i->second=NULL;
i->second=nullptr;
}
}
@@ -71,7 +71,7 @@ void MessageToManager::handleMessageTo(const MessageToPayload &data)
{
DEBUG_WARNING(true,("Received message %s twice.",data.getMessageId().getValueString().c_str()));
delete i->second;
i->second = NULL;
i->second = nullptr;
}
m_messagesByObject[theKey]=new MessageToPayload(data);
@@ -127,7 +127,7 @@ void MessageToManager::removeMessage(const MessageToId &messageId)
if (j!=m_messagesByObject.end())
{
delete j->second;
j->second=NULL;
j->second=nullptr;
m_messagesByObject.erase(j);
}
m_messageToObjectMap.erase(i);