diff options
Diffstat (limited to 'runtime/mirror/object_test.cc')
| -rw-r--r-- | runtime/mirror/object_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index e24602abec..18e50ce013 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -18,6 +18,7 @@ #include <stdint.h> #include <stdio.h> +#include <memory> #include "array-inl.h" #include "art_field-inl.h" @@ -36,7 +37,6 @@ #include "object_array-inl.h" #include "handle_scope-inl.h" #include "string-inl.h" -#include "UniquePtrCompat.h" namespace art { namespace mirror { @@ -48,7 +48,7 @@ class ObjectTest : public CommonRuntimeTest { const char* utf16_expected_le, int32_t expected_hash) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - UniquePtr<uint16_t[]> utf16_expected(new uint16_t[expected_utf16_length]); + std::unique_ptr<uint16_t[]> utf16_expected(new uint16_t[expected_utf16_length]); for (int32_t i = 0; i < expected_utf16_length; i++) { uint16_t ch = (((utf16_expected_le[i*2 + 0] & 0xff) << 8) | ((utf16_expected_le[i*2 + 1] & 0xff) << 0)); @@ -116,7 +116,7 @@ TEST_F(ObjectTest, Clone) { TEST_F(ObjectTest, AllocObjectArray) { ScopedObjectAccess soa(Thread::Current()); StackHandleScope<2> hs(soa.Self()); - Handle<ObjectArray<Object> > oa( + Handle<ObjectArray<Object>> oa( hs.NewHandle(class_linker_->AllocObjectArray<Object>(soa.Self(), 2))); EXPECT_EQ(2, oa->GetLength()); EXPECT_TRUE(oa->Get(0) == NULL); |