diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-09 05:19:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 05:19:06 +0000 |
| commit | ddb605d4b2fa544bab69a72a288e578f2dd37f52 (patch) | |
| tree | 960f4458f89c212bb5347566f79676adfac0b1f1 /tools/aapt | |
| parent | 60803943f8276a311b7f985613b285a60b042886 (diff) | |
| parent | de86cf1362ef0461b589fa85bdd5c58921010c6a (diff) | |
| download | frameworks_base-ddb605d4b2fa544bab69a72a288e578f2dd37f52.zip frameworks_base-ddb605d4b2fa544bab69a72a288e578f2dd37f52.tar.gz frameworks_base-ddb605d4b2fa544bab69a72a288e578f2dd37f52.tar.bz2 | |
am de86cf13: am 5a6934c0: Merge "Don\'t pollute the namespace for two uses."
* commit 'de86cf1362ef0461b589fa85bdd5c58921010c6a':
Don't pollute the namespace for two uses.
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/ResourceIdCache.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/aapt/ResourceIdCache.cpp b/tools/aapt/ResourceIdCache.cpp index d60a07f..d7b2d10 100644 --- a/tools/aapt/ResourceIdCache.cpp +++ b/tools/aapt/ResourceIdCache.cpp @@ -9,7 +9,6 @@ #include <utils/Log.h> #include "ResourceIdCache.h" #include <map> -using namespace std; static size_t mHits = 0; @@ -29,7 +28,7 @@ struct CacheEntry { CacheEntry(const android::String16& name, uint32_t resId) : hashedName(name), id(resId) { } }; -static map< uint32_t, CacheEntry > mIdMap; +static std::map< uint32_t, CacheEntry > mIdMap; // djb2; reasonable choice for strings when collisions aren't particularly important @@ -63,7 +62,7 @@ uint32_t ResourceIdCache::lookup(const android::String16& package, bool onlyPublic) { const String16 hashedName = makeHashableName(package, type, name, onlyPublic); const uint32_t hashcode = hash(hashedName); - map<uint32_t, CacheEntry>::iterator item = mIdMap.find(hashcode); + std::map<uint32_t, CacheEntry>::iterator item = mIdMap.find(hashcode); if (item == mIdMap.end()) { // cache miss mMisses++; |