Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 22b7e496c2

* commit '22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
  Use std::unique_ptr instead of UniquePtr.
This commit is contained in:
Dan Albert
2015-11-05 19:40:59 +00:00
committed by android-build-merger
parent e1348a7fa9 22b7e496c2
commit 3061d67f86
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/idmap/create.cpp
View File

@@ -1,6 +1,6 @@
#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;
}

4
cmds/idmap/scan.cpp
View File

@@ -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;