X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FMippleton.hh;h=a27a6c5023645e049fe51cebe6055a34964cda9c;hp=7ad17823a45862cfe7eae2b7f0d03148c34db692;hb=a31d65a998121df0651c57bfb68782e2a07d2e2f;hpb=31d52677b38d935297d132bdbd956c655cd3feee diff --git a/src/Moof/Mippleton.hh b/src/Moof/Mippleton.hh index 7ad1782..a27a6c5 100644 --- a/src/Moof/Mippleton.hh +++ b/src/Moof/Mippleton.hh @@ -54,14 +54,14 @@ class Mippleton typedef std::pair PtrValue; typedef stlplus::hash PtrMap; - static PtrMap ptrs_; - std::string name_; + static PtrMap mPtrMap; + std::string mName; static T* retain(const std::string& name) { - typename PtrMap::iterator it = ptrs_.find(name); + typename PtrMap::iterator it = mPtrMap.find(name); - if (it != ptrs_.end()) + if (it != mPtrMap.end()) { ++((*it).second.first); return (*it).second.second; @@ -69,35 +69,35 @@ class Mippleton else { T* newObj = new T(name); - ptrs_.insert(std::make_pair(name, std::make_pair(1, newObj))); + mPtrMap.insert(std::make_pair(name, std::make_pair(1, newObj))); return newObj; } } static void release(T* obj) { - releaseByName(obj->name_); + releaseByName(obj->mName); } static void releaseByName(const std::string& name) { typename PtrMap::iterator it; - if ((it = ptrs_.find(name)) != ptrs_.end() && --(*it).second.first == 0) + if ((it = mPtrMap.find(name)) != mPtrMap.end() && --(*it).second.first == 0) { delete (*it).second.second; - ptrs_.erase((*it).first); + mPtrMap.erase((*it).first); } } public: explicit Mippleton(const std::string& name) : - name_(name) {} + mName(name) {} const std::string& getName() const { - return name_; + return mName; } static boost::shared_ptr getInstance(const std::string& name) @@ -108,7 +108,7 @@ public: template stlplus::hash< std::string,std::pair,getHash > - Mippleton::ptrs_; + Mippleton::mPtrMap; } // namespace Mf