diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /compiler/image_test.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'compiler/image_test.cc')
| -rw-r--r-- | compiler/image_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/image_test.cc b/compiler/image_test.cc index 0babfe3a56..92be147a40 100644 --- a/compiler/image_test.cc +++ b/compiler/image_test.cc @@ -16,6 +16,7 @@ #include "image.h" +#include <memory> #include <string> #include <vector> @@ -27,7 +28,6 @@ #include "lock_word.h" #include "mirror/object-inl.h" #include "signal_catcher.h" -#include "UniquePtrCompat.h" #include "utils.h" #include "vector_output_stream.h" @@ -88,7 +88,7 @@ TEST_F(ImageTest, WriteRead) { } } // Workound bug that mcld::Linker::emit closes oat_file by reopening as dup_oat. - UniquePtr<File> dup_oat(OS::OpenFileReadWrite(oat_file.GetFilename().c_str())); + std::unique_ptr<File> dup_oat(OS::OpenFileReadWrite(oat_file.GetFilename().c_str())); ASSERT_TRUE(dup_oat.get() != NULL); const uintptr_t requested_image_base = ART_BASE_ADDRESS; @@ -102,7 +102,7 @@ TEST_F(ImageTest, WriteRead) { } { - UniquePtr<File> file(OS::OpenFileForReading(image_file.GetFilename().c_str())); + std::unique_ptr<File> file(OS::OpenFileForReading(image_file.GetFilename().c_str())); ASSERT_TRUE(file.get() != NULL); ImageHeader image_header; file->ReadFully(&image_header, sizeof(image_header)); @@ -130,7 +130,7 @@ TEST_F(ImageTest, WriteRead) { java_lang_dex_file_ = NULL; std::string error_msg; - UniquePtr<const DexFile> dex(DexFile::Open(GetLibCoreDexFileName().c_str(), + std::unique_ptr<const DexFile> dex(DexFile::Open(GetLibCoreDexFileName().c_str(), GetLibCoreDexFileName().c_str(), &error_msg)); ASSERT_TRUE(dex.get() != nullptr) << error_msg; |