diff options
| author | 2017-08-08 23:45:33 +0000 | |
|---|---|---|
| committer | 2017-08-08 23:45:33 +0000 | |
| commit | 5b1a00f4af5e4fde764593952a730377e60de4f3 (patch) | |
| tree | 357d182129a54dffef7d25e6af9fcc81f3ce5354 | |
| parent | 27a7c02f0ca4afa27cd1516b342ab485df03c15b (diff) | |
| parent | 4e7d18a72f72967a881bcdf78167011a836538ef (diff) | |
Merge "Change UniquePtr to std::unique_ptr" into oc-mr1-dev
| -rw-r--r-- | cmds/cmd/cmd.cpp | 5 |
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 { |