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/trace.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 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 'runtime/trace.cc')
| -rw-r--r-- | runtime/trace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/trace.cc b/runtime/trace.cc index b85eb7e6b6..d53b369ed8 100644 --- a/runtime/trace.cc +++ b/runtime/trace.cc @@ -119,7 +119,7 @@ ProfilerClockSource Trace::default_clock_source_ = kDefaultProfilerClockSource; Trace* volatile Trace::the_trace_ = NULL; pthread_t Trace::sampling_pthread_ = 0U; -UniquePtr<std::vector<mirror::ArtMethod*> > Trace::temp_stack_trace_; +std::unique_ptr<std::vector<mirror::ArtMethod*>> Trace::temp_stack_trace_; static mirror::ArtMethod* DecodeTraceMethodId(uint32_t tmid) { return reinterpret_cast<mirror::ArtMethod*>(tmid & ~kTraceMethodActionMask); @@ -339,7 +339,7 @@ void Trace::Start(const char* trace_filename, int trace_fd, int buffer_size, int runtime->GetThreadList()->SuspendAll(); // Open trace file if not going directly to ddms. - UniquePtr<File> trace_file; + std::unique_ptr<File> trace_file; if (!direct_to_ddms) { if (trace_fd < 0) { trace_file.reset(OS::CreateEmptyFile(trace_filename)); |