Prefer vector over list

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

diff --git a/source/loader.h b/source/loader.h
index 207ecff8dff8d7f068aa033994ef2a5e608ba56a..de0b32deaaa06f4aae771ff64644a68cfdfe4d11 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;
 
@@ -174,6 +174,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 +190,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...);