From b1d8c314b55bb2df2b2bb72a3daaf5db65b7ebc7 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Tue, 4 Aug 2015 11:18:43 -0700 Subject: Revert "cleanup: Replace pointers with out-parameters and fix-up formatting" This reverts commit a315f5c546b796f55f4872bb6efc15eb858d9639. -- Revert "runtime: cleanup class_linker out-parameters and formatting" This reverts commit bc1d78daa463572c5a770cdca858a3b51d8e1b7b. -- Revert "base: replace raw pointers for out-parameters with safer out" This reverts commit fb326cffc679cab8eb873b9e44795706f023cb3c. --- runtime/native/java_lang_VMClassLoader.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/native/java_lang_VMClassLoader.cc') diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 62a0b7653d..15156301c8 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -16,7 +16,6 @@ #include "java_lang_VMClassLoader.h" -#include "base/out.h" #include "class_linker.h" #include "jni_internal.h" #include "mirror/class_loader.h" @@ -46,7 +45,7 @@ static jclass VMClassLoader_findLoadedClass(JNIEnv* env, jclass, jobject javaLoa // Try the common case. StackHandleScope<1> hs(soa.Self()); cl->FindClassInPathClassLoader(soa, soa.Self(), descriptor.c_str(), descriptor_hash, - hs.NewHandle(loader), outof(c)); + hs.NewHandle(loader), &c); if (c != nullptr) { return soa.AddLocalReference(c); } -- cgit v1.2.3-59-g8ed1b