summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-11-05 21:11:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-05 21:11:03 +0000
commit8f3ef3fd09d4cf6b0d9c102f8ecfebcb5a3ae506 (patch)
treed4b839a71156358c9399e024a2d2507d6d90ce11
parent79602945d8b3e83fd679e20948ecb2085900a58e (diff)
parent40f76c2fedb18664adab73e40b8b64227601d4e6 (diff)
Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870 am: 0c69e9f271
am: 40f76c2fed * commit '40f76c2fedb18664adab73e40b8b64227601d4e6': Use std::unique_ptr instead of UniquePtr.
-rw-r--r--include/utils/LruCache.h5
-rw-r--r--libutils/CallStack.cpp5
2 files changed, 5 insertions, 5 deletions
diff --git a/include/utils/LruCache.h b/include/utils/LruCache.h
index 20a379ecc..1741fb2e4 100644
--- a/include/utils/LruCache.h
+++ b/include/utils/LruCache.h
@@ -17,10 +17,9 @@
#ifndef ANDROID_UTILS_LRU_CACHE_H
#define ANDROID_UTILS_LRU_CACHE_H
+#include <memory>
#include <unordered_set>
-#include <UniquePtr.h>
-
#include "utils/TypeHelpers.h" // hash_t
namespace android {
@@ -91,7 +90,7 @@ private:
return result;
}
- UniquePtr<LruCacheSet> mSet;
+ std::unique_ptr<LruCacheSet> mSet;
OnEntryRemoved<TKey, TValue>* mListener;
Entry* mOldest;
Entry* mYoungest;
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__);
}