Support loader functions with bound first argument

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

diff --git a/source/loader.h b/source/loader.h
index 3e39872a5c2f1263d6748a761d28a52baa97e0f7..7799a7eacb5dd404915f25cbfe87f0665f515436 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -44,7 +44,7 @@ private:
        const Statement *cur_st;
        bool sub_loaded;
        bool direct;
-       std::list<Loader *> aux_loaders;
+       std::vector<Loader *> aux_loaders;
 protected:
        bool check_sub_loads;
 
@@ -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,15 @@ 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
+
+#if __cplusplus>=201103L
+       /** Adds a keyword that is loaded by calling a function with a bound
+       first argument. */
+       template<typename L, typename B0, typename... Args>
+       void add(const std::string &k, void (L::*func)(B0, Args...), const typename RemoveReference<B0>::Type &b0)
+       { add(k, new LoaderFuncNBound1<L, B0, Args...>(func, b0)); }
+#endif
 
        /** Adds a keyword that is loaded into a member of the loaded object. */
        template<typename L, typename T0>