swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-02 03:16:11 -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/application/TaskManager/src/shared/TaskManager.cpp
+5 -5
View File
@@ -161,7 +161,7 @@ m_processEntries(),
m_localServers(),
m_remoteServers(),
m_nodeLabel(),
m_startTime(::time(NULL)),
m_startTime(::time(nullptr)),
m_nodeList(),
m_nodeNumber(-1),
m_nodeToConnectToList(),
@@ -362,7 +362,7 @@ void TaskManager::processRcFile()
void TaskManager::setupNodeList()
{
char buffer[64];
const char* result = NULL;
const char* result = nullptr;
int nodeIndex = 0;
bool found = true;
@@ -375,7 +375,7 @@ void TaskManager::setupNodeList()
{
found = false;
sprintf(buffer, "node%d", nodeIndex);
result = ConfigFile::getKeyString("TaskManager", buffer, NULL);
result = ConfigFile::getKeyString("TaskManager", buffer, nullptr);
if (result)
{
NodeEntry n(result, buffer, nodeIndex);
@@ -967,8 +967,8 @@ void TaskManager::update()
// of slave TaskManager that has disconnected but has not reconnected,
// so that an alert can be made in SOEMon so ops can see it and restart
// the disconnected TaskManager
static time_t timeSystemTimeCheck = ::time(NULL) + ConfigTaskManager::getSystemTimeCheckIntervalSeconds();
time_t const timeNow = ::time(NULL);
static time_t timeSystemTimeCheck = ::time(nullptr) + ConfigTaskManager::getSystemTimeCheckIntervalSeconds();
time_t const timeNow = ::time(nullptr);
if (timeSystemTimeCheck <= timeNow)
{
if (getNodeLabel() != "node0")