diff options
Diffstat (limited to 'native/jni/jni_common.cpp')
| -rw-r--r-- | native/jni/jni_common.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index 8d7bce79e..4eeda1d4e 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -1,6 +1,5 @@ /* - * - * Copyright 2011, The Android Open Source Project + * Copyright (C) 2011, The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,11 +36,11 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { JNIEnv *env = 0; jint result = -1; - if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { + if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { AKLOGE("ERROR: GetEnv failed"); goto bail; } - assert(env != 0); + assert(env); if (!register_BinaryDictionary(env)) { AKLOGE("ERROR: BinaryDictionary native registration failed"); @@ -59,7 +58,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) { } /* success -- return valid version number */ - result = JNI_VERSION_1_4; + result = JNI_VERSION_1_6; bail: return result; @@ -70,7 +69,7 @@ namespace latinime { int registerNativeMethods(JNIEnv *env, const char *className, JNINativeMethod *methods, int numMethods) { jclass clazz = env->FindClass(className); - if (clazz == 0) { + if (!clazz) { AKLOGE("Native registration unable to find class '%s'", className); return JNI_FALSE; } |