diff options
| author | 2018-09-20 04:59:30 +0000 | |
|---|---|---|
| committer | 2018-09-20 04:59:30 +0000 | |
| commit | 144f0826919bf7af915bd165fc67eb12aead843c (patch) | |
| tree | 7e55557e118eb5fffe03ad3456e00d8469a36232 /runtime/jni/java_vm_ext.cc | |
| parent | 4727396c867c6b4641f5bb0edb925d554379ae8e (diff) | |
| parent | 9a20ff06f7ccee08a742c315ec6d351ab56ba1cd (diff) | |
Merge changes If50d37b5,I0f40f91c,I02e8702c
* changes:
ART: Refactor typedef to using
ART: Fix dexdump & dexlist
ART: Add redundant-void-arg check
Diffstat (limited to 'runtime/jni/java_vm_ext.cc')
| -rw-r--r-- | runtime/jni/java_vm_ext.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/jni/java_vm_ext.cc b/runtime/jni/java_vm_ext.cc index 42406cf73c..6769368ee4 100644 --- a/runtime/jni/java_vm_ext.cc +++ b/runtime/jni/java_vm_ext.cc @@ -333,7 +333,7 @@ class Libraries { } ScopedThreadSuspension sts(self, kNative); // Do this without holding the jni libraries lock to prevent possible deadlocks. - typedef void (*JNI_OnUnloadFn)(JavaVM*, void*); + using JNI_OnUnloadFn = void(*)(JavaVM*, void*); for (auto library : unload_libraries) { void* const sym = library->FindSymbol("JNI_OnUnload", nullptr); if (sym == nullptr) { @@ -1026,7 +1026,7 @@ bool JavaVMExt::LoadNativeLibrary(JNIEnv* env, self->SetClassLoaderOverride(class_loader); VLOG(jni) << "[Calling JNI_OnLoad in \"" << path << "\"]"; - typedef int (*JNI_OnLoadFn)(JavaVM*, void*); + using JNI_OnLoadFn = int(*)(JavaVM*, void*); JNI_OnLoadFn jni_on_load = reinterpret_cast<JNI_OnLoadFn>(sym); int version = (*jni_on_load)(this, nullptr); |