diff options
| author | Dan Albert <danalbert@google.com> | 2015-11-05 19:58:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 19:58:51 +0000 |
| commit | 40f76c2fedb18664adab73e40b8b64227601d4e6 (patch) | |
| tree | 1310b700ea67078cb3952e2e0fc54f8822d091f7 /libutils | |
| parent | a61944043671859da7693dc444e54eada977947d (diff) | |
| parent | 0c69e9f271d05271b1deceb03ef6248a6805c193 (diff) | |
Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870
am: 0c69e9f271
* commit '0c69e9f271d05271b1deceb03ef6248a6805c193':
Use std::unique_ptr instead of UniquePtr.
Diffstat (limited to 'libutils')
| -rw-r--r-- | libutils/CallStack.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libutils/CallStack.cpp b/libutils/CallStack.cpp index 0bfb520e9..699da7469 100644 --- a/libutils/CallStack.cpp +++ b/libutils/CallStack.cpp @@ -16,11 +16,12 @@ #define LOG_TAG "CallStack" +#include <memory> + #include <utils/CallStack.h> #include <utils/Printer.h> #include <utils/Errors.h> #include <utils/Log.h> -#include <UniquePtr.h> #include <backtrace/Backtrace.h> @@ -40,7 +41,7 @@ CallStack::~CallStack() { void CallStack::update(int32_t ignoreDepth, pid_t tid) { mFrameLines.clear(); - UniquePtr<Backtrace> backtrace(Backtrace::Create(BACKTRACE_CURRENT_PROCESS, tid)); + std::unique_ptr<Backtrace> backtrace(Backtrace::Create(BACKTRACE_CURRENT_PROCESS, tid)); if (!backtrace->Unwind(ignoreDepth)) { ALOGW("%s: Failed to unwind callstack.", __FUNCTION__); } |