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/jni_internal.cc | |
| 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/jni_internal.cc')
| -rw-r--r-- | runtime/jni_internal.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 21dab8d..3afb149 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -49,7 +49,7 @@ #include "ScopedLocalRef.h" #include "thread.h" #include "utf.h" -#include "UniquePtr.h" +#include "UniquePtrCompat.h" #include "well_known_classes.h" namespace art { |