diff options
| author | 2015-11-05 00:57:12 -0800 | |
|---|---|---|
| committer | 2015-11-05 13:03:26 -0800 | |
| commit | 0881a7445f9106e835486c5a697c01f4f18e619b (patch) | |
| tree | 49850fcc71fcb4102234dd82b05c6ac74be7de33 | |
| parent | 429c5b93ff66e82fa3fd65475489fde133c66002 (diff) | |
Use std::unique_ptr instead of UniquePtr.
We're deprecating UniquePtr, so we need to move to the real thing.
Bug: http://b/22403888
Change-Id: I5b7fdf4924dd8c12a8c7dba89278714ca6fdc60a
(cherry picked from commit b0624da1181276ff4caa5e57a7a4abf766902e3e)
| -rw-r--r-- | cmds/idmap/create.cpp | 4 | ||||
| -rw-r--r-- | cmds/idmap/scan.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp index 6b2f46099b80..c13d318f7449 100644 --- a/cmds/idmap/create.cpp +++ b/cmds/idmap/create.cpp @@ -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; } diff --git a/cmds/idmap/scan.cpp b/cmds/idmap/scan.cpp index f1b2f9e72ca0..6d30f0d0ce34 100644 --- a/cmds/idmap/scan.cpp +++ b/cmds/idmap/scan.cpp @@ -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; |