diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-15 16:42:40 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-15 16:50:51 -0700 |
| commit | 507dfdd147c97bfbadebfd63584d094b6a4e7b47 (patch) | |
| tree | cce43931b6dcd088cb2932c2491f86116353a27f /runtime/gc/accounting | |
| parent | 922ddb30982d2597eab634d8b8598bec0eb7d3b7 (diff) | |
| download | art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.zip art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.gz art-507dfdd147c97bfbadebfd63584d094b6a4e7b47.tar.bz2 | |
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/accounting')
| -rw-r--r-- | runtime/gc/accounting/atomic_stack.h | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/card_table.h | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/mod_union_table.cc | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/remembered_set.cc | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/space_bitmap-inl.h | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/space_bitmap.h | 2 | ||||
| -rw-r--r-- | runtime/gc/accounting/space_bitmap_test.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/runtime/gc/accounting/atomic_stack.h b/runtime/gc/accounting/atomic_stack.h index c79b586..7d8b584 100644 --- a/runtime/gc/accounting/atomic_stack.h +++ b/runtime/gc/accounting/atomic_stack.h @@ -23,7 +23,7 @@ #include "atomic.h" #include "base/logging.h" #include "base/macros.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "mem_map.h" #include "utils.h" diff --git a/runtime/gc/accounting/card_table.h b/runtime/gc/accounting/card_table.h index 8d5dc07..17e62a6 100644 --- a/runtime/gc/accounting/card_table.h +++ b/runtime/gc/accounting/card_table.h @@ -20,7 +20,7 @@ #include "base/mutex.h" #include "globals.h" #include "mem_map.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { diff --git a/runtime/gc/accounting/mod_union_table.cc b/runtime/gc/accounting/mod_union_table.cc index 7cddaf4..ef5653a 100644 --- a/runtime/gc/accounting/mod_union_table.cc +++ b/runtime/gc/accounting/mod_union_table.cc @@ -30,7 +30,7 @@ #include "mirror/object_array-inl.h" #include "space_bitmap-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" using ::art::mirror::Object; diff --git a/runtime/gc/accounting/remembered_set.cc b/runtime/gc/accounting/remembered_set.cc index bbbd1ed..1def334 100644 --- a/runtime/gc/accounting/remembered_set.cc +++ b/runtime/gc/accounting/remembered_set.cc @@ -30,7 +30,7 @@ #include "mirror/object_array-inl.h" #include "space_bitmap-inl.h" #include "thread.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace gc { diff --git a/runtime/gc/accounting/space_bitmap-inl.h b/runtime/gc/accounting/space_bitmap-inl.h index 646fce6..a439462 100644 --- a/runtime/gc/accounting/space_bitmap-inl.h +++ b/runtime/gc/accounting/space_bitmap-inl.h @@ -28,7 +28,7 @@ #include "mirror/object_array-inl.h" #include "object_utils.h" #include "space_bitmap-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "utils.h" namespace art { diff --git a/runtime/gc/accounting/space_bitmap.h b/runtime/gc/accounting/space_bitmap.h index a805809..1ccebf5 100644 --- a/runtime/gc/accounting/space_bitmap.h +++ b/runtime/gc/accounting/space_bitmap.h @@ -22,7 +22,7 @@ #include "globals.h" #include "mem_map.h" #include "object_callbacks.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include <limits.h> #include <set> diff --git a/runtime/gc/accounting/space_bitmap_test.cc b/runtime/gc/accounting/space_bitmap_test.cc index 972f94d..71db44b 100644 --- a/runtime/gc/accounting/space_bitmap_test.cc +++ b/runtime/gc/accounting/space_bitmap_test.cc @@ -21,7 +21,7 @@ #include "common_runtime_test.h" #include "globals.h" #include "space_bitmap-inl.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" namespace art { namespace gc { |