From 507dfdd147c97bfbadebfd63584d094b6a4e7b47 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 15 May 2014 16:42:40 -0700 Subject: Compatibility layer to transition from UniquePtr to std::unique_ptr. Use ART_WITH_STLPORT (enabled for the target) to cause the use of UniquePtr, for the host switch to std::unique_ptr. For now the type remains called UniquePtr. Make dalvik compile with clang on the host, move its build to C++11. Change-Id: I5ba8d2757904bc089ed62047ea03de3c0853fb12 --- runtime/class_linker_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/class_linker_test.cc') diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 0db08aa1ab..9970dd5081 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -18,7 +18,7 @@ #include -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "dex_file.h" -- cgit v1.2.3