swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-03 04:19:20 -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/serverScript/src/shared/ScriptMethodsPermissions.cpp
+4 -4
View File
@@ -85,7 +85,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetBanned(JNI
{
ServerObject *serverObj = 0;
if (!JavaLibrary::getObject(target, serverObj))
return NULL;
return nullptr;
LocalObjectArrayRefPtr strArray;
BuildingObject *buildingObj = dynamic_cast<BuildingObject*>(serverObj);
@@ -96,7 +96,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetBanned(JNI
if (cellObj)
if (ScriptConversion::convert(cellObj->getBanned(), strArray))
return strArray->getReturnValue();
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------
@@ -114,7 +114,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetAllowed(JN
{
ServerObject *serverObj = 0;
if (!JavaLibrary::getObject(target, serverObj))
return NULL;
return nullptr;
LocalObjectArrayRefPtr strArray;
BuildingObject *buildingObj = dynamic_cast<BuildingObject*>(serverObj);
@@ -125,7 +125,7 @@ jobjectArray JNICALL ScriptMethodsPermissionsNamespace::permissionsGetAllowed(JN
if (cellObj)
if (ScriptConversion::convert(cellObj->getAllowed(), strArray))
return strArray->getReturnValue();
return NULL;
return nullptr;
}
// ----------------------------------------------------------------------