From: Mikko Rasa Date: Wed, 15 Oct 2014 18:22:07 +0000 (+0300) Subject: Make Loader a virtual base of ObjectLoader to permit diamond inheritance X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c834c80972ce2415f7d5f35cc9f9498ac1f08f85;p=libs%2Fdatafile.git 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 a2a8720..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 -class ObjectLoader: public Loader +class ObjectLoader: virtual public Loader { public: typedef O Object;