diff options
| author | 2014-05-15 16:42:40 -0700 | |
|---|---|---|
| committer | 2014-05-15 16:50:51 -0700 | |
| commit | 507dfdd147c97bfbadebfd63584d094b6a4e7b47 (patch) | |
| tree | cce43931b6dcd088cb2932c2491f86116353a27f /runtime/gc/allocator/rosalloc.h | |
| parent | 922ddb30982d2597eab634d8b8598bec0eb7d3b7 (diff) | |
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
Diffstat (limited to 'runtime/gc/allocator/rosalloc.h')
| -rw-r--r-- | runtime/gc/allocator/rosalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h index 8557f1bcad..9ea4306028 100644 --- a/runtime/gc/allocator/rosalloc.h +++ b/runtime/gc/allocator/rosalloc.h @@ -28,7 +28,7 @@ #include "base/logging.h" #include "globals.h" #include "mem_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" // Ensure we have an unordered_set until we have worked out C++ library issues. |