X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=174c7fcabce52812083a7d8184670d2b24eda32e;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=7a09f5047d501dc0d361744b25c3714b36a5409a;hpb=7184146e19a45f968a4bc4d0cee252f13dbeb7c5;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 7a09f50..174c7fc 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -17,17 +17,14 @@ namespace DataFile {
 Helper struct to determine whether a Loader has a Collection typedef.
 */
 template<typename T>
-struct NeedsCollection
+struct NeedsCollection: public Sfinae
 {
-	struct Yes { char c[2]; };
-	struct No { char c; };
-
 	template<typename U>
 	static Yes f(typename U::Collection *);
 	template<typename U>
 	static No f(...);
 
-	enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+	enum { value = Evaluate<sizeof(f<T>(0))>::value };
 };
 
 class CollectionItemTypeBase;
@@ -266,10 +263,14 @@ protected:
 	in the order they are added. */
 	void add_source(CollectionSource &);
 
+public:
 	/** Opens a raw resource, without interpreting it as object data.  Null is
 	returned if no such file is found.  The caller must dispose of the returned
 	object when done with it. */
-	IO::Seekable *open_from_sources(const std::string &);
+	IO::Seekable *open_raw(const std::string &) const;
+
+protected:
+	IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
 
 private:
 	void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;
@@ -379,7 +380,7 @@ private:
 		Creator(FuncPtr f): func(f) { }
 
 		virtual T *create(Collection &coll, const std::string &name) const
-		{ return (static_cast<C &>(coll).*func)(name); }
+		{ return (dynamic_cast<C &>(coll).*func)(name); }
 	};
 
 	template<typename B>