swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -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/MetricsServer/src/shared/MetricsGatheringConnection.cpp
+10 -10
View File
@@ -169,19 +169,19 @@ void MetricsGatheringConnection::update(const std::vector<MetricsPair> & data)
//note: we know that the "isSecret", and "isLocked" nodes will come after the "population" node in the list
// we are iterating over, so they will override the population setting
if (strstr((*dataIter).m_label.c_str(), "population") != NULL)
if (strstr((*dataIter).m_label.c_str(), "population") != nullptr)
{
// there are nodes under the population node, so don't interpret them as the population
if (strstr((*dataIter).m_label.c_str(), "population.") == NULL)
if (strstr((*dataIter).m_label.c_str(), "population.") == nullptr)
mon->set(MetricsServer::getWorldCountChannel(), std::max((*dataIter).m_value, 0));
}
else if (strstr((*dataIter).m_label.c_str(), "isSecret") != NULL
|| strstr((*dataIter).m_label.c_str(), "isLocked") != NULL)
else if (strstr((*dataIter).m_label.c_str(), "isSecret") != nullptr
|| strstr((*dataIter).m_label.c_str(), "isLocked") != nullptr)
{
if ((*dataIter).m_value == 1)
mon->set(MetricsServer::getWorldCountChannel(), STATUS_LOCKED);
}
else if (strstr((*dataIter).m_label.c_str(), "isLoading") != NULL)
else if (strstr((*dataIter).m_label.c_str(), "isLoading") != nullptr)
{
// include in the root node description how
// long the cluster has been loading
@@ -226,19 +226,19 @@ void MetricsGatheringConnection::update(const std::vector<MetricsPair> & data)
//note: we know that the "isSecret", and "isLocked" nodes will come after the "population" node in the list
// we are iterating over, so they will override the population setting
if (strstr((*dataIter).m_label.c_str(), "population") != NULL)
if (strstr((*dataIter).m_label.c_str(), "population") != nullptr)
{
// there are nodes under the population node, so don't interpret them as the population
if (strstr((*dataIter).m_label.c_str(), "population.") == NULL)
if (strstr((*dataIter).m_label.c_str(), "population.") == nullptr)
mon->set(MetricsServer::getWorldCountChannel(), std::max((*dataIter).m_value, 0));
}
else if (strstr((*dataIter).m_label.c_str(), "isSecret") != NULL
|| strstr((*dataIter).m_label.c_str(), "isLocked") != NULL)
else if (strstr((*dataIter).m_label.c_str(), "isSecret") != nullptr
|| strstr((*dataIter).m_label.c_str(), "isLocked") != nullptr)
{
if ((*dataIter).m_value == 1)
mon->set(MetricsServer::getWorldCountChannel(), STATUS_LOCKED);
}
else if (strstr((*dataIter).m_label.c_str(), "isLoading") != NULL)
else if (strstr((*dataIter).m_label.c_str(), "isLoading") != nullptr)
{
// include in the root node description how
// long the cluster has been loading