Switch template parameters of load_sub around to allow automatic deduction

diff --git a/source/loader.h b/source/loader.h
index 6a0a1e39fd488dbfcaa5e2b9a77569188160d517..7d5d8d9690dfd1c9460739e7a22332a26e6d5e42 100644 (file)
--- 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)