Change DerivedObjectLoader to take the base loader as template argument

This makes it much more versatile, as it can now be used to derive from
a protected loader or one with a nonstandard name.

diff --git a/source/objectloader.h b/source/objectloader.h
index 5928714215cd056297cab8fd79e1f9647fe648e2..4dcb981864e7c2d924a61dcbd44e552dfffa6cb0 100644 (file)
--- a/source/objectloader.h
+++ b/source/objectloader.h
@@ -40,7 +40,7 @@ Convenience class for loading derived objects.  Inherits from the base class
 loader and shadows its members with ones for the derived type.
 */
 template<typename O, typename B>
-class DerivedObjectLoader: public B::Loader
+class DerivedObjectLoader: public B
 {
 public:
        typedef O Object;
@@ -48,7 +48,7 @@ public:
 protected:
        O &obj;
 
-       DerivedObjectLoader(O &o): B::Loader(o), obj(o) { }
+       DerivedObjectLoader(O &o): B(o), obj(o) { }
 
 public:
        O &get_object() const { return obj; }