typedef Msp::TypeRegistry<CreateObject, DynamicObjectLoader &> TypeRegistry;
- Collection *coll;
+ Collection *coll = nullptr;
+ T *object = nullptr;
private:
- T *object;
- Loader *obj_loader;
- std::function<void(Collection &, const std::string &, T *)> store_func;
+ Loader *obj_loader = nullptr;
+ void (*store_func)(Collection &, const std::string &, T *) = nullptr;
static ActionMap shared_actions;
~DynamicObjectLoader() { delete object; delete obj_loader; }
private:
- virtual void init_actions();
+ void init_actions() override;
public:
T *get_object() { T *o = object; object = 0; return o; }
T *store_object(Collection &, const std::string &);
-private:
- void type(const Symbol &);
+protected:
+ virtual void type(const Symbol &);
+private:
template<typename U>
typename std::enable_if<NeedsCollection<typename U::Loader>::value, typename U::Loader *>::type create_object_loader(U &obj) const;
template<typename T, typename C>
DynamicObjectLoader<T, C>::DynamicObjectLoader(Collection *c):
- coll(c),
- object(0),
- obj_loader(0)
+ coll(c)
{
set_actions(shared_actions);
}
ldr.object = obj;
ldr.obj_loader = ldr.create_object_loader<U>(*obj);
ldr.add_auxiliary_loader(*ldr.obj_loader);
- ldr.store_func = [&ldr](Collection &c, const std::string &n, T *o){ c.add(n, static_cast<U *>(o)); };
+ ldr.store_func = [](Collection &c, const std::string &n, T *o){ c.add(n, static_cast<U *>(o)); };
}
} // namespace DataFile