diff options
| author | 2015-11-05 21:42:03 +0000 | |
|---|---|---|
| committer | 2015-11-05 21:42:03 +0000 | |
| commit | aace04efb14a35301e252d10f2e4cd029ce1ba9f (patch) | |
| tree | 9080981d5fc7f3ee676971837bb9d7e566efac80 /cmds/idmap/create.cpp | |
| parent | 9548b380d98cf5fe2e3b0102e283e5e3b39a8968 (diff) | |
| parent | 0881a7445f9106e835486c5a697c01f4f18e619b (diff) | |
Merge "Use std::unique_ptr instead of UniquePtr."
Diffstat (limited to 'cmds/idmap/create.cpp')
| -rw-r--r-- | cmds/idmap/create.cpp | 4 |
1 files changed, 2 insertions, 2 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; } |