Make Loader a virtual base of ObjectLoader to permit diamond inheritance

Useful when creating loader classes through composition.

diff --git a/source/objectloader.h b/source/objectloader.h
index a2a8720e840e6393f3e185950741fc6ba0df5729..76fc412abed60db13c7b7e4b80837ffad0ca93df 100644 (file)
--- 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;