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

Commit 9b9286a2 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Change UniquePtr to std::unique_ptr" am: 625d6a8c

am: 354b2997

Change-Id: I34baf9585108d008e4ad2357e97c696e64760b3b
parents 0999d283 354b2997
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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
{