diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-21 16:50:40 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-22 12:44:27 -0700 |
| commit | 2cebb24bfc3247d3e9be138a3350106737455918 (patch) | |
| tree | d04d27d21b3c7733d784e303f01f873bb99e7770 /runtime/zip_archive.cc | |
| parent | 1f02f1a7b3073b8fef07770a67fbf94afad317f0 (diff) | |
| download | art-2cebb24bfc3247d3e9be138a3350106737455918.tar.gz art-2cebb24bfc3247d3e9be138a3350106737455918.tar.bz2 art-2cebb24bfc3247d3e9be138a3350106737455918.zip | |
Replace NULL with nullptr
Also fixed some lines that were too long, and a few other minor
details.
Change-Id: I6efba5fb6e03eb5d0a300fddb2a75bf8e2f175cb
Diffstat (limited to 'runtime/zip_archive.cc')
| -rw-r--r-- | runtime/zip_archive.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/zip_archive.cc b/runtime/zip_archive.cc index ffab674be1..88c1f69bf5 100644 --- a/runtime/zip_archive.cc +++ b/runtime/zip_archive.cc @@ -56,7 +56,7 @@ MemMap* ZipEntry::ExtractToMemMap(const char* zip_filename, const char* entry_fi name += " extracted in memory from "; name += zip_filename; std::unique_ptr<MemMap> map(MemMap::MapAnonymous(name.c_str(), - NULL, GetUncompressedLength(), + nullptr, GetUncompressedLength(), PROT_READ | PROT_WRITE, false, false, error_msg)); if (map.get() == nullptr) { |