X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FMippleton.hh;h=e9b97328d351ae9de7e08527a49984f90030231b;hp=9ef960276b34a8d9384557d2b2a8d690c36d7488;hb=5fa5f117f28922a7e539a432367960c1a61f837d;hpb=a5f0d391406a68275b41448fc3f49e8d8396c497

diff --git a/src/Moof/Mippleton.hh b/src/Moof/Mippleton.hh
index 9ef9602..e9b9732 100644
--- a/src/Moof/Mippleton.hh
+++ b/src/Moof/Mippleton.hh
@@ -40,6 +40,8 @@
 
 #include <string>
 
+#include <boost/shared_ptr.hpp>
+
 #include <Moof/Hash.hh>
 
 
@@ -49,26 +51,15 @@ namespace Mf {
 template <class T>
 class Mippleton
 {
-	typedef std::pair<unsigned,T*>								ptr_value_t;
-	typedef std::pair<std::string,ptr_value_t>					ptr_map_pair_t;
-	typedef stlplus::hash<std::string,ptr_value_t,hash_string>	ptr_map_t;
-	//typedef std::map<std::string,ptr_value_t>	ptr_map_t;
-
-	static ptr_map_t	ptrs_;
-	std::string			name_;
-
-public:
-	explicit Mippleton(const std::string& name) :
-		name_(name) {}
+	typedef std::pair<unsigned,T*>								PtrValue;
+	typedef stlplus::hash<std::string,PtrValue,getHash>	PtrMap;
 
-	inline const std::string& getName() const
-	{
-		return name_;
-	}
+	static PtrMap	ptrs_;
+	std::string		name_;
 
 	inline static T* retain(const std::string& name)
 	{
-		typename ptr_map_t::iterator it = ptrs_.find(name);
+		typename PtrMap::iterator it = ptrs_.find(name);
 
 		if (it != ptrs_.end())
 		{
@@ -78,14 +69,19 @@ public:
 		else
 		{
 			T* newObj = new T(name);
-			ptrs_.insert(ptr_map_pair_t(name, ptr_value_t(1, newObj)));
+			ptrs_.insert(std::make_pair(name, std::make_pair(1, newObj)));
 			return newObj; 
 		}
 	}
 
+	inline static void release(T* obj)
+	{
+		releaseByName(obj->name_);
+	}
+
 	inline static void releaseByName(const std::string& name)
 	{
-		typename ptr_map_t::iterator it;
+		typename PtrMap::iterator it;
 
 		if ((it = ptrs_.find(name)) != ptrs_.end() && --(*it).second.first == 0)
 		{
@@ -94,15 +90,23 @@ public:
 		}
 	}
 
-	inline static void release(T* obj)
+public:
+	explicit Mippleton(const std::string& name) :
+		name_(name) {}
+
+	inline const std::string& getName() const
+	{
+		return name_;
+	}
+
+	inline static boost::shared_ptr<T> getInstance(const std::string& name)
 	{
-		releaseByName(obj->getName());
+		return boost::shared_ptr<T>(retain(name), &release);
 	}
 };
 
 template <class T>
-stlplus::hash< std::string,std::pair<unsigned,T*>,hash_string >
-//std::map< std::string,std::pair<unsigned,T*> >
+stlplus::hash< std::string,std::pair<unsigned,T*>,getHash >
 	Mippleton<T>::ptrs_;