From be4b3f905d1a5b660f8f40d78a5bd1657d774e59 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 17 Dec 2016 19:55:13 +0000 Subject: [PATCH] clang 4.0 fixes --- .../serverScript/src/shared/JNIWrappers.cpp | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index cb943db2..f7fbed96 100755 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -855,7 +855,7 @@ LocalRefParam::~LocalRefParam() jobject LocalRefParam::getReturnValue(void) { jobject return_val = m_ref; - m_ref = 0; + m_ref = nullptr; return return_val; } @@ -865,7 +865,7 @@ jobject LocalRefParam::getReturnValue(void) */ void LocalRefParam::emergencyClear() { - m_ref = 0; + m_ref = nullptr; } @@ -902,9 +902,9 @@ LocalRef::LocalRef(jobject src) : LocalRef::~LocalRef() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; + m_ref = nullptr; } @@ -917,9 +917,9 @@ LocalArrayRef::LocalArrayRef(jarray src) : LocalArrayRef::~LocalArrayRef() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; + m_ref = nullptr; } @@ -932,9 +932,9 @@ LocalObjectArrayRef::LocalObjectArrayRef(jobjectArray src) : LocalObjectArrayRef::~LocalObjectArrayRef() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; + m_ref = nullptr; } @@ -1008,9 +1008,9 @@ GlobalRef::GlobalRef(const LocalRefParam & src) : GlobalRef::~GlobalRef() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); - m_ref = 0; + m_ref = nullptr; } @@ -1025,9 +1025,9 @@ GlobalArrayRef::GlobalArrayRef(const LocalObjectArrayRefParam & src) : GlobalArrayRef::~GlobalArrayRef() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteGlobalRef(m_ref); - m_ref = 0; + m_ref = nullptr; } //======================================================================== @@ -1048,7 +1048,7 @@ JavaStringParam::~JavaStringParam() int JavaStringParam::fillBuffer(char * buffer, int size) const { - if (m_ref > 0 && buffer != nullptr && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && buffer != nullptr && JavaLibrary::getEnv() != nullptr) { // 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. @@ -1093,9 +1093,9 @@ JavaString::JavaString(const Unicode::String & src) : JavaString::~JavaString() { - if (m_ref > 0 && JavaLibrary::getEnv() != nullptr) + if (m_ref != nullptr && JavaLibrary::getEnv() != nullptr) JavaLibrary::getEnv()->DeleteLocalRef(m_ref); - m_ref = 0; + m_ref = nullptr; }