X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fdynamicobjectloader.h;h=9706c957e7403eba40960e016d79dec1171fb8ac;hb=a2cce9e933089f483163456e9872e005c33dd678;hp=551a0a63dd1f454cbc691cbe53ebf96b620f23f1;hpb=f2f933f53cd729ca034e054085b96107f64f3928;p=libs%2Fdatafile.git

diff --git a/source/dynamicobjectloader.h b/source/dynamicobjectloader.h
index 551a0a6..9706c95 100644
--- a/source/dynamicobjectloader.h
+++ b/source/dynamicobjectloader.h
@@ -34,7 +34,7 @@ protected:
 	T *object;
 private:
 	Loader *obj_loader;
-	std::function<void(Collection &, const std::string &, T *)> store_func;
+	void (*store_func)(Collection &, const std::string &, T *);
 
 	static ActionMap shared_actions;
 
@@ -71,8 +71,9 @@ Loader::ActionMap DynamicObjectLoader<T, C>::shared_actions;
 template<typename T, typename C>
 DynamicObjectLoader<T, C>::DynamicObjectLoader(Collection *c):
 	coll(c),
-	object(0),
-	obj_loader(0)
+	object(nullptr),
+	obj_loader(nullptr),
+	store_func(nullptr)
 {
 	set_actions(shared_actions);
 }