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 207ecff8dff8d7f068aa033994ef2a5e608ba56a..02caaaf9ee75dce3ca573cf929611124e551053f 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,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>
@@ -174,6 +181,8 @@ template<typename T, typename... Args>
 void load(T &obj, typename T::Loader::Collection &coll, const std::string &fn, Args &... args)
 {
        RefPtr<IO::Seekable> in = coll.open_raw(fn);
+       if(!in)
+               throw IO::file_not_found(fn);
 
        Parser parser(*in, fn);
        typename T::Loader loader(obj, coll, args...);
@@ -188,6 +197,8 @@ template<typename T, typename C, typename... Args>
 typename EnableIf<NeedsCollection<typename T::Loader>::value, void>::No load(T &obj, C &coll, const std::string &fn, Args &... args)
 {
        RefPtr<IO::Seekable> in = coll.open_raw(fn);
+       if(!in)
+               throw IO::file_not_found(fn);
 
        Parser parser(*in, fn);
        typename T::Loader loader(obj, args...);