Support N-ary loader functions if compiling in C++11 mode

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index de0b32deaaa06f4aae771ff64644a68cfdfe4d11..02caaaf9ee75dce3ca573cf929611124e551053f 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -97,6 +97,12 @@ protected:
        void add(const std::string &k, void (L::*func)(A0))
        { add(k, new LoaderFunc1<L, A0>(func)); }
 
+#if __cplusplus>=201103L
+       template<typename L, typename... Args>
+       void add(const std::string &k, void (L::*func)(Args...))
+       { add(k, new LoaderFuncN<L, Args...>(func)); }
+
+#else
        template<typename L, typename A0, typename A1>
        void add(const std::string &k, void (L::*func)(A0, A1))
        { add(k, new LoaderFunc2<L, A0, A1>(func)); }
@@ -112,6 +118,7 @@ protected:
        template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
        void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4))
        { add(k, new LoaderFunc5<L, A0, A1, A2, A3, A4>(func)); }
+#endif
 
        /** Adds a keyword that is loaded into a member of the loaded object. */
        template<typename L, typename T0>