diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /runtime/common_runtime_test.h | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 54ef68d..bac212a 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -24,6 +24,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <fstream> +#include <memory> #include "../../external/icu4c/common/unicode/uvernum.h" #include "base/macros.h" @@ -47,7 +48,6 @@ #include "ScopedLocalRef.h" #include "thread.h" #include "utils.h" -#include "UniquePtrCompat.h" #include "verifier/method_verifier.h" #include "verifier/method_verifier-inl.h" #include "well_known_classes.h" @@ -107,7 +107,7 @@ class ScratchFile { private: std::string filename_; - UniquePtr<File> file_; + std::unique_ptr<File> file_; }; class CommonRuntimeTest : public testing::Test { @@ -304,7 +304,7 @@ class CommonRuntimeTest : public testing::Test { std::string dalvik_cache_; const DexFile* java_lang_dex_file_; // owned by runtime_ std::vector<const DexFile*> boot_class_path_; - UniquePtr<Runtime> runtime_; + std::unique_ptr<Runtime> runtime_; // Owned by the runtime ClassLinker* class_linker_; |