mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-08-02 03:16:11 -04:00
newer standards prefer nullptr over NULL - this is most of them but there are others too
This commit is contained in:
@@ -25,11 +25,11 @@ namespace LocatorNamespace
|
||||
float getConfigSetting(const char *section, const char *key, const float defaultValue)
|
||||
{
|
||||
const ConfigFile::Section * sec = ConfigFile::getSection(section);
|
||||
if (sec == NULL)
|
||||
if (sec == nullptr)
|
||||
return defaultValue;
|
||||
|
||||
const ConfigFile::Key * ky = sec->findKey(key);
|
||||
if (ky == NULL)
|
||||
if (ky == nullptr)
|
||||
return defaultValue;
|
||||
|
||||
return ky->getAsFloat(ky->getCount()-1, defaultValue);
|
||||
@@ -364,7 +364,7 @@ void Locator::opened(std::string const &label, ManagerConnection *newConnection)
|
||||
TaskManager::runSpawnRequestQueue();
|
||||
}
|
||||
else
|
||||
WARNING_STRICT_FATAL(true, ("Passed null connection to Locator::opened"));
|
||||
WARNING_STRICT_FATAL(true, ("Passed nullptr connection to Locator::opened"));
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user