X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcollection.h;h=24be69dd2f70cd07d425453b3121788b2ff60086;hb=6678cf025ca97dd398a9304b0578f146d1f7af80;hp=6ddbe6ed65c980d035b30160ad1eca18c0390f1f;hpb=9c0da3059eed8470325477d99a0d56f0948534fd;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 6ddbe6e..24be69d 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -105,19 +105,22 @@ private:
 		virtual ~ItemCreatorBase() { }
 
 		template<typename S>
-		S *create(Collection &coll, const std::string &name)
+		bool create(Collection &coll, const std::string &name, S *&ptr)
 		{
 			ItemCreatorBridge<S> *creator=dynamic_cast<ItemCreatorBridge<S> *>(this);
 			if(creator)
-				return creator->create(coll, name);
-			return 0;
+			{
+				creator->create(coll, name, ptr);
+				return true;
+			}
+			return false;
 		}
 	};
 
 	template<typename S>
 	struct ItemCreatorBridge: public ItemCreatorBase
 	{
-		virtual S *create(Collection &, const std::string &) const =0;
+		virtual bool create(Collection &, const std::string &, S *&) const =0;
 	};
 
 	template<typename T, typename S, typename C>
@@ -198,7 +201,7 @@ public:
 	Gets an object of a specific type from the collection.
 	*/
 	template<typename T>
-	T &get(const std::string &name) const
+	T *get(const std::string &name) const
 	{
 		typedef typename RemoveConst<T>::Type NCT;
 
@@ -219,7 +222,7 @@ public:
 	invoked.
 	*/
 	template<typename T>
-	T &get(const std::string &name)
+	T *get(const std::string &name)
 	{
 		typedef typename RemoveConst<T>::Type NCT;
 
@@ -227,12 +230,15 @@ public:
 		if(i==items.end())
 		{
 			for(ItemCreatorSeq::iterator j=creators.begin(); j!=creators.end(); ++j)
-				if(NCT *d=(*j)->create<NCT>(*this, name))
+			{
+				NCT *d=0;
+				if((*j)->create(*this, name, d))
 				{
 					// We already know that the item didn't exist yet
 					items[name]=new Item<NCT>(d);
 					return *d;
 				}
+			}
 			throw KeyError("Item '"+name+"' not found in collection");
 		}