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

Commit 429d2117 authored by Jiyong Park's avatar Jiyong Park Committed by Andreas Gampe
Browse files

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.

(cherry picked from commit 4e7d18a7)

Bug: 63686260
Test: builds, cmd works in the device.
Merged-In: Ib008acd1dd7dba2305b0797c9dc7bab1aa747e7d
Change-Id: Ib008acd1dd7dba2305b0797c9dc7bab1aa747e7d
parent 329904ff

cmds/cmd/cmd.cpp

+2 −3
Original line number Original line Diff line number Diff line
@@ -35,12 +35,11 @@ 
#include <fcntl.h>

#include <fcntl.h>

#include <sys/time.h>

#include <sys/time.h>

#include <errno.h>

#include <errno.h>

#include <memory>





#include "selinux/selinux.h"

#include "selinux/selinux.h"

#include "selinux/android.h"

#include "selinux/android.h"





#include <UniquePtr.h>



#define DEBUG 0

#define DEBUG 0





using namespace android;

using namespace android;
@@ -55,7 +54,7 @@ struct SecurityContext_Delete { 
        freecon(p);

        freecon(p);

    }

    }

};

};

typedef UniquePtr<char[], SecurityContext_Delete> Unique_SecurityContext;

typedef std::unique_ptr<char[], SecurityContext_Delete> Unique_SecurityContext;





class MyShellCallback : public BnShellCallback

class MyShellCallback : public BnShellCallback

{

{