Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f61f868 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Use std::unique_ptr instead of UniquePtr."

parents fe8213f0 f2d25096

include/utils/LruCache.h

+2 −3
Original line number Diff line number Diff line
@@ -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;

libutils/CallStack.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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__);

    }