diff options
| author | 2018-09-25 00:36:43 +0000 | |
|---|---|---|
| committer | 2018-09-25 00:36:43 +0000 | |
| commit | fc4b2eaa427e43a51c6f39ffecac0ef4fa732b61 (patch) | |
| tree | b6bc4cd9bc846ae40eac280dbc2c9514e05a0f7b /runtime/jni/java_vm_ext.cc | |
| parent | 26f048f48cdb1e884aab2b6fddf26d58346d29ad (diff) | |
| parent | c55bb390d88b8eb62a50932f7f9b47c2a3733f16 (diff) | |
Merge "Revert^2 "ART: Refactor typedef to using""
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); |