X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectloader.h;h=76fc412abed60db13c7b7e4b80837ffad0ca93df;hb=4edbe0eb078c4e480682862ccb68ebc8cb284045;hp=4dcb981864e7c2d924a61dcbd44e552dfffa6cb0;hpb=2f1bd0bcbdf17a7f1015f4fdf0e4ad8c97eb1966;p=libs%2Fdatafile.git

diff --git a/source/objectloader.h b/source/objectloader.h
index 4dcb981..76fc412 100644
--- a/source/objectloader.h
+++ b/source/objectloader.h
@@ -20,7 +20,7 @@ Provides the basic functionality of an object loader.  Deriving from this
 allows loading values directly into member variables of the objects.
 */
 template<typename O>
-class ObjectLoader: public Loader
+class ObjectLoader: virtual public Loader
 {
 public:
 	typedef O Object;
@@ -50,6 +50,9 @@ protected:
 
 	DerivedObjectLoader(O &o): B(o), obj(o) { }
 
+	template<typename T>
+	DerivedObjectLoader(O &o, T &a): B(o, a), obj(o) { }
+
 public:
 	O &get_object() const { return obj; }
 };