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

Commit 22b7e496 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Use std::unique_ptr instead of UniquePtr."

parents 8c358207 b0624da1

cmds/idmap/create.cpp

+2 −2
Original line number Diff line number Diff line 
#include "idmap.h"



#include <UniquePtr.h>

#include <memory>

#include <androidfw/AssetManager.h>

#include <androidfw/ResourceTypes.h>

#include <androidfw/ZipFileRO.h>
@@ -15,7 +15,7 @@ using namespace android; 
namespace {

    int get_zip_entry_crc(const char *zip_path, const char *entry_name, uint32_t *crc)

    {

        UniquePtr<ZipFileRO> zip(ZipFileRO::open(zip_path));

        std::unique_ptr<ZipFileRO> zip(ZipFileRO::open(zip_path));

        if (zip.get() == NULL) {

            return -1;

        }

cmds/idmap/scan.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include "idmap.h"



#include <UniquePtr.h>

#include <memory>

#include <androidfw/ResourceTypes.h>

#include <androidfw/StreamingZipInflater.h>

#include <androidfw/ZipFileRO.h>
@@ -120,7 +120,7 @@ namespace { 


    int parse_apk(const char *path, const char *target_package_name)

    {

        UniquePtr<ZipFileRO> zip(ZipFileRO::open(path));

        std::unique_ptr<ZipFileRO> zip(ZipFileRO::open(path));

        if (zip.get() == NULL) {

            ALOGW("%s: failed to open zip %s\n", __FUNCTION__, path);

            return -1;