Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c6c7573 authored by Dan Albert's avatar Dan Albert
Browse files

Don't pollute the namespace for two uses. 

Clang complains about ambiguity between std::hash and ::hash (locally
defined). There's no need to pull in the whole namespace for two uses of
std::map anyway.

Change-Id: Icbaa7ebbaad05999988784ad34662c721fb12b29
parent f4eaaadb

tools/aapt/ResourceIdCache.cpp

+2 −3
Original line number Diff line number Diff line
@@ -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++;