swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-30 15:13:12 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3e4cc36e7e.
This commit is contained in:
DarthArgus
2016-02-11 19:44:31 -06:00
parent 3e4cc36e7e
commit 8e2160f33e
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/JNIWrappers.cpp
+14 -14
View File
@@ -90,7 +90,7 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...)
JavaStringPtr createNewString(const char * bytes)
{
if (bytes != nullptr)
if (bytes != NULL)
{
JavaStringPtr result(new JavaString(JavaLibrary::getEnv()->NewStringUTF(bytes)));
if (result->getValue() != 0)
@@ -103,7 +103,7 @@ JavaStringPtr createNewString(const char * bytes)
JavaStringPtr createNewString(const jchar * unicodeChars, jsize len)
{
if (unicodeChars != nullptr && len >= 0)
if (unicodeChars != NULL && len >= 0)
{
JavaStringPtr result(new JavaString(JavaLibrary::getEnv()->NewString(unicodeChars, len)));
if (result->getValue() != 0)
@@ -902,7 +902,7 @@ LocalRef::LocalRef(jobject src) :
LocalRef::~LocalRef()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteLocalRef(m_ref);
m_ref = 0;
}
@@ -917,7 +917,7 @@ LocalArrayRef::LocalArrayRef(jarray src) :
LocalArrayRef::~LocalArrayRef()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteLocalRef(m_ref);
m_ref = 0;
}
@@ -932,7 +932,7 @@ LocalObjectArrayRef::LocalObjectArrayRef(jobjectArray src) :
LocalObjectArrayRef::~LocalObjectArrayRef()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteLocalRef(m_ref);
m_ref = 0;
}
@@ -1002,13 +1002,13 @@ LocalLongArrayRef::~LocalLongArrayRef()
GlobalRef::GlobalRef(const LocalRefParam & src) :
LocalRefParam(static_cast<jobject>(0))
{
if (src.getValue() != 0 && JavaLibrary::getEnv() != nullptr)
if (src.getValue() != 0 && JavaLibrary::getEnv() != NULL)
m_ref = JavaLibrary::getEnv()->NewGlobalRef(src.getValue());
}
GlobalRef::~GlobalRef()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteGlobalRef(m_ref);
m_ref = 0;
}
@@ -1019,13 +1019,13 @@ GlobalRef::~GlobalRef()
GlobalArrayRef::GlobalArrayRef(const LocalObjectArrayRefParam & src) :
LocalObjectArrayRefParam(static_cast<jobjectArray>(0))
{
if (src.getValue() != 0 && JavaLibrary::getEnv() != nullptr)
if (src.getValue() != 0 && JavaLibrary::getEnv() != NULL)
m_ref = JavaLibrary::getEnv()->NewGlobalRef(src.getValue());
}
GlobalArrayRef::~GlobalArrayRef()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteGlobalRef(m_ref);
m_ref = 0;
}
@@ -1048,10 +1048,10 @@ JavaStringParam::~JavaStringParam()
int JavaStringParam::fillBuffer(char * buffer, int size) const
{
if (m_ref != 0 && buffer != nullptr && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && buffer != NULL && JavaLibrary::getEnv() != NULL)
{
// Get the number of storage bytes required to convert this Java string into a UTF-8 string.
// Include the terminating nullptr byte in the required buffer size.
// Include the terminating null byte in the required buffer size.
int requiredBufferSize = JavaLibrary::getEnv()->GetStringUTFLength(static_cast<jstring>(m_ref)) + 1;
if (requiredBufferSize <= size)
{
@@ -1059,7 +1059,7 @@ int JavaStringParam::fillBuffer(char * buffer, int size) const
JavaLibrary::getEnv()->GetStringUTFRegion(static_cast<jstring>(m_ref), 0, stringLength, buffer);
// Null terminate the string. requiredBufferSize already includes the byte count for the nullptr terminator.
// Null terminate the string. requiredBufferSize already includes the byte count for the null terminator.
buffer[requiredBufferSize - 1] = '\0';
return requiredBufferSize;
@@ -1077,7 +1077,7 @@ JavaString::JavaString(jstring src) :
}
JavaString::JavaString(const char * src) :
JavaStringParam(JavaLibrary::getEnv()->NewStringUTF(src != nullptr ? src : ""))
JavaStringParam(JavaLibrary::getEnv()->NewStringUTF(src != NULL ? src : ""))
{
}
@@ -1093,7 +1093,7 @@ JavaString::JavaString(const Unicode::String & src) :
JavaString::~JavaString()
{
if (m_ref != 0 && JavaLibrary::getEnv() != nullptr)
if (m_ref != 0 && JavaLibrary::getEnv() != NULL)
JavaLibrary::getEnv()->DeleteLocalRef(m_ref);
m_ref = 0;
}