X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.h;h=7d5d8d9690dfd1c9460739e7a22332a26e6d5e42;hp=6a0a1e39fd488dbfcaa5e2b9a77569188160d517;hb=c4930d8d15a5a248ca921e0ed3f9bca8aa18b322;hpb=9bd3c79199faf81023a5109ae4999708be79d303

diff --git a/source/loader.h b/source/loader.h
index 6a0a1e3..7d5d8d9 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -251,12 +251,12 @@ protected:
 	*/
 	template<typename S>
 	void load_sub(S &s)
-	{ load_sub<S, typename S::Loader>(s); }
+	{ load_sub<typename S::Loader, S>(s); }
 
 	/**
 	Loads a sub-object with a custom Loader class.
 	*/
-	template<typename S, typename L>
+	template<typename L, typename S>
 	void load_sub(S &s)
 	{
 		if(!cur_st)
@@ -269,7 +269,7 @@ protected:
 	Loads a sub-object with a custom Loader class that takes one argument in
 	addition to to object to be loaded.
 	*/
-	template<typename S, typename L, typename T>
+	template<typename L, typename S, typename T>
 	void load_sub(S &s, T &p)
 	{
 		if(!cur_st)