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/profiler.h | |
| 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/profiler.h')
| -rw-r--r-- | runtime/profiler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/profiler.h b/runtime/profiler.h index bcd7c29793..938fdb7730 100644 --- a/runtime/profiler.h +++ b/runtime/profiler.h @@ -17,6 +17,7 @@ #ifndef ART_RUNTIME_PROFILER_H_ #define ART_RUNTIME_PROFILER_H_ +#include <memory> #include <ostream> #include <set> #include <string> @@ -29,7 +30,6 @@ #include "instrumentation.h" #include "os.h" #include "safe_map.h" -#include "UniquePtrCompat.h" namespace art { @@ -177,7 +177,7 @@ class BackgroundMethodSamplingProfiler { ProfileSampleResults profile_table_; - UniquePtr<Barrier> profiler_barrier_; + std::unique_ptr<Barrier> profiler_barrier_; // Set of methods to be filtered out. This will probably be rare because // most of the methods we want to be filtered reside in the boot path and |