From bc1d78daa463572c5a770cdca858a3b51d8e1b7b Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Thu, 30 Jul 2015 16:39:45 -0700 Subject: runtime: cleanup class_linker out-parameters and formatting * Use out instead of parameters * Fixes up some other signatures to be more correct * Reformat parameters to be one per line if they can't fit on one line * Reformat locks to be one per line if they can't fit on the decl line Change-Id: Ib71b08707d3ed0bb85299406c0b23a1de4e92a1c --- runtime/oat_file_assistant_test.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/oat_file_assistant_test.cc') diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index 03ad2d5ac8..65263d0f30 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -26,6 +26,7 @@ #include #include "art_field-inl.h" +#include "base/out.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "compiler_callbacks.h" @@ -958,7 +959,9 @@ class RaceGenerateTask : public Task { ClassLinker* linker = Runtime::Current()->GetClassLinker(); std::vector> dex_files; std::vector error_msgs; - dex_files = linker->OpenDexFilesFromOat(dex_location_.c_str(), oat_location_.c_str(), &error_msgs); + dex_files = linker->OpenDexFilesFromOat(dex_location_.c_str(), + oat_location_.c_str(), + outof(error_msgs)); CHECK(!dex_files.empty()) << Join(error_msgs, '\n'); CHECK(dex_files[0]->GetOatDexFile() != nullptr) << dex_files[0]->GetLocation(); loaded_oat_file_ = dex_files[0]->GetOatDexFile()->GetOatFile(); -- cgit v1.2.3-59-g8ed1b