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. --- compiler/oat_test.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'compiler/oat_test.cc') diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 05a33d7a7f..88dc29e6ab 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -16,7 +16,6 @@ #include "arch/instruction_set_features.h" #include "art_method-inl.h" -#include "base/out.h" #include "class_linker.h" #include "common_compiler_test.h" #include "compiled_method.h" @@ -84,7 +83,7 @@ TEST_F(OatTest, WriteRead) { std::string error_msg; std::unique_ptr insn_features( - InstructionSetFeatures::FromVariant(insn_set, "default", outof(error_msg))); + InstructionSetFeatures::FromVariant(insn_set, "default", &error_msg)); ASSERT_TRUE(insn_features.get() != nullptr) << error_msg; compiler_options_.reset(new CompilerOptions); verification_results_.reset(new VerificationResults(compiler_options_.get())); @@ -124,7 +123,7 @@ TEST_F(OatTest, WriteRead) { compiler_driver_->CompileAll(class_loader, class_linker->GetBootClassPath(), &timings); } std::unique_ptr oat_file(OatFile::Open(tmp.GetFilename(), tmp.GetFilename(), nullptr, - nullptr, false, nullptr, outof(error_msg))); + nullptr, false, nullptr, &error_msg)); ASSERT_TRUE(oat_file.get() != nullptr) << error_msg; const OatHeader& oat_header = oat_file->GetOatHeader(); ASSERT_TRUE(oat_header.IsValid()); @@ -191,7 +190,7 @@ TEST_F(OatTest, OatHeaderIsValid) { InstructionSet insn_set = kX86; std::string error_msg; std::unique_ptr insn_features( - InstructionSetFeatures::FromVariant(insn_set, "default", outof(error_msg))); + InstructionSetFeatures::FromVariant(insn_set, "default", &error_msg)); ASSERT_TRUE(insn_features.get() != nullptr) << error_msg; std::vector dex_files; uint32_t image_file_location_oat_checksum = 0; -- cgit v1.2.3-59-g8ed1b