tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870 am: 0c69e9f271

Browse source 
am: 40f76c2fed

* commit '40f76c2fedb18664adab73e40b8b64227601d4e6':
  Use std::unique_ptr instead of UniquePtr.
This commit is contained in:
Dan Albert 2015-11-05 21:11:03 +00:00 committed by android-build-merger
commit 8f3ef3fd09
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/utils/LruCache.h
View file

@ -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;

5
libutils/CallStack.cpp
View file

@ -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__);
}