swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-21 06:12:56 -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/ScriptMethodsImageDesign.cpp
+5 -5
View File
@@ -70,7 +70,7 @@ void JNICALL ScriptMethodsImageDesignNamespace::imagedesignStart(JNIEnv *env, jo
return;
}
//the terminal can be NULL (that means no ID terminal is being used, which is fine)
//the terminal can be nullptr (that means no ID terminal is being used, which is fine)
ServerObject * terminalObj = 0;
JavaLibrary::getObject(jterminalId, terminalObj);
@@ -185,8 +185,8 @@ jboolean JNICALL ScriptMethodsImageDesignNamespace::imagedesignValidated(JNIEnv
WARNING(true, ("morph keys and values arrays are of diffent sizes"));
return JNI_FALSE;
}
jfloat * const morphChangesValuesArray = env->GetFloatArrayElements(jmorphChangesValues, NULL);
if (morphChangesValuesArray == NULL)
jfloat * const morphChangesValuesArray = env->GetFloatArrayElements(jmorphChangesValues, nullptr);
if (morphChangesValuesArray == nullptr)
{
return JNI_FALSE;
}
@@ -211,8 +211,8 @@ jboolean JNICALL ScriptMethodsImageDesignNamespace::imagedesignValidated(JNIEnv
WARNING(true, ("index keys and values arrays are of diffent sizes"));
return JNI_FALSE;
}
jint * const indexChangesValuesArray = env->GetIntArrayElements(jindexChangesValues, NULL);
if (indexChangesValuesArray == NULL)
jint * const indexChangesValuesArray = env->GetIntArrayElements(jindexChangesValues, nullptr);
if (indexChangesValuesArray == nullptr)
{
return JNI_FALSE;
}