swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "newer standards prefer nullptr over NULL - this is most of them but there are others too""

Browse Source 
This reverts commit 8e2160f33e.
This commit is contained in:
DarthArgus
2016-02-11 21:19:18 -06:00
parent 8e2160f33e
commit dd9db6d350
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/ScriptMethodsString.cpp
+3 -3
View File
@@ -56,7 +56,7 @@ const JNINativeMethod NATIVES[] = {
* @param self class calling this function
* @param id the stringId to find
*
* @return the string, or null on error
* @return the string, or nullptr on error
*/
jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject self, jobject id)
{
@@ -64,7 +64,7 @@ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject sel
if (id == 0)
{
WARNING(true, ("JavaLibrary::log getString is NULL."));
WARNING(true, ("JavaLibrary::log getString is nullptr."));
return 0;
}
@@ -116,7 +116,7 @@ jstring JNICALL ScriptMethodsStringNamespace::getString(JNIEnv *env, jobject sel
* @param self class calling this function
* @param ids array of stringIds to find
*
* @return an array of strings, or null on error
* @return an array of strings, or nullptr on error
*/
jobjectArray JNICALL ScriptMethodsStringNamespace::getStrings(JNIEnv *env, jobject self, jobjectArray ids)
{