clang 4.0 fixes

This commit is contained in:
DarthArgus
2016-12-17 19:55:13 +00:00
parent 9edcb12503
commit be4b3f905d
@@ -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;
}