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 /compiler/common_compiler_test.h | |
parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
download | android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 android_art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip |
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 'compiler/common_compiler_test.h')
-rw-r--r-- | compiler/common_compiler_test.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 7a91e47fb1..fb6c625926 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -420,18 +420,18 @@ class CommonCompilerTest : public CommonRuntimeTest { image_reservation_.reset(); } - UniquePtr<CompilerOptions> compiler_options_; - UniquePtr<VerificationResults> verification_results_; - UniquePtr<DexFileToMethodInlinerMap> method_inliner_map_; - UniquePtr<CompilerCallbacksImpl> callbacks_; - UniquePtr<CompilerDriver> compiler_driver_; - UniquePtr<CumulativeLogger> timer_; + std::unique_ptr<CompilerOptions> compiler_options_; + std::unique_ptr<VerificationResults> verification_results_; + std::unique_ptr<DexFileToMethodInlinerMap> method_inliner_map_; + std::unique_ptr<CompilerCallbacksImpl> callbacks_; + std::unique_ptr<CompilerDriver> compiler_driver_; + std::unique_ptr<CumulativeLogger> timer_; private: - UniquePtr<MemMap> image_reservation_; + std::unique_ptr<MemMap> image_reservation_; // Chunks must not move their storage after being created - use the node-based std::list. - std::list<std::vector<uint8_t> > header_code_and_maps_chunks_; + std::list<std::vector<uint8_t>> header_code_and_maps_chunks_; }; } // namespace art |