summaryrefslogtreecommitdiff
path: root/cmds/cmd/cmd.cpp
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2017-08-07 20:48:32 +0900
committer Jiyong Park <jiyong@google.com> 2017-08-07 20:48:32 +0900
commit4e7d18a72f72967a881bcdf78167011a836538ef (patch)
tree5259d85ddd10dbbfdc2823564093d5c3f6859c7b /cmds/cmd/cmd.cpp
parent0632b778331dfc46979b8865fdd530e61d5bdef9 (diff)
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
Diffstat (limited to 'cmds/cmd/cmd.cpp')
-rw-r--r--cmds/cmd/cmd.cpp5
1 files 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 <fcntl.h>
#include <sys/time.h>
#include <errno.h>
+#include <memory>
#include "selinux/selinux.h"
#include "selinux/android.h"
-#include <UniquePtr.h>
-
#define DEBUG 0
using namespace android;
@@ -55,7 +54,7 @@ struct SecurityContext_Delete {
freecon(p);
}
};
-typedef UniquePtr<char[], SecurityContext_Delete> Unique_SecurityContext;
+typedef std::unique_ptr<char[], SecurityContext_Delete> Unique_SecurityContext;
class MyShellCallback : public BnShellCallback
{