From 4e7d18a72f72967a881bcdf78167011a836538ef Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 7 Aug 2017 20:48:32 +0900 Subject: Change UniquePtr to std::unique_ptr UniquePtr.h in libnativehelper/include is deprecated and will be removed soon. Switching to the standard std::unique_ptr. Bug: 63686260 Test: builds, cmd works in the device. Change-Id: Ib008acd1dd7dba2305b0797c9dc7bab1aa747e7d --- cmds/cmd/cmd.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp index 7e05d72eae..014c99593c 100644 --- a/cmds/cmd/cmd.cpp +++ b/cmds/cmd/cmd.cpp @@ -35,12 +35,11 @@ #include #include #include +#include #include "selinux/selinux.h" #include "selinux/android.h" -#include - #define DEBUG 0 using namespace android; @@ -55,7 +54,7 @@ struct SecurityContext_Delete { freecon(p); } }; -typedef UniquePtr Unique_SecurityContext; +typedef std::unique_ptr Unique_SecurityContext; class MyShellCallback : public BnShellCallback { -- cgit v1.2.3-59-g8ed1b