diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-08 02:04:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-08 02:04:43 +0000 |
| commit | 5bf0c65eef972e743ca02e93f8d5ad7df5097931 (patch) | |
| tree | 28c3f347ee4b4c25547911cb737f38614b18b3b1 /include | |
| parent | bc1d97556d32a45ceca5db3e2af12cd3d4cf5590 (diff) | |
| parent | f89a2fdacb2ba907f180188dc79f9de81e3eb254 (diff) | |
| download | frameworks_base-5bf0c65eef972e743ca02e93f8d5ad7df5097931.zip frameworks_base-5bf0c65eef972e743ca02e93f8d5ad7df5097931.tar.gz frameworks_base-5bf0c65eef972e743ca02e93f8d5ad7df5097931.tar.bz2 | |
am f89a2fda: Merge "Frameworks/base: Fix two warnings in cmds"
* commit 'f89a2fdacb2ba907f180188dc79f9de81e3eb254':
Frameworks/base: Fix two warnings in cmds
Diffstat (limited to 'include')
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index 03b7f4a..ba72cd5 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1793,9 +1793,7 @@ public: const char* targetPath, const char* overlayPath, void** outData, size_t* outSize) const; - enum { - IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256, - }; + static const size_t IDMAP_HEADER_SIZE_BYTES = 4 * sizeof(uint32_t) + 2 * 256; // Retrieve idmap meta-data. // |