X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floaderaction.h;h=4666687e71534fd15d63499898ce9217250f4ee9;hb=256b44a5009467171af53316141277027bcc0ba4;hp=a3b04437d279e3e6835bd20538d2c99311721064;hpb=b0186e8878204a29e25ca4063c1dac4dea908508;p=libs%2Fdatafile.git

diff --git a/source/loaderaction.h b/source/loaderaction.h
index a3b0443..4666687 100644
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -8,7 +8,6 @@
 namespace Msp {
 namespace DataFile {
 
-#if __cplusplus>=201103L
 template<typename T>
 std::string create_signature(const std::string &prefix = std::string())
 { return prefix+std::string(1, TypeInfo<T>::signature); }
@@ -16,7 +15,6 @@ std::string create_signature(const std::string &prefix = std::string())
 template<typename T0, typename T1, typename... Tail>
 std::string create_signature(const std::string &prefix = std::string())
 { return create_signature<T1, Tail...>(prefix+std::string(1, TypeInfo<T0>::signature)); }
-#endif
 
 class Loader;
 
@@ -115,8 +113,8 @@ public:
 	{
 		std::vector<A0> values;
 		values.reserve(st.args.size());
-		for(Statement::Arguments::const_iterator i=st.args.begin(); i!=st.args.end(); ++i)
-			values.push_back(i->get<A0>());
+		for(const Value &a: st.args)
+			values.push_back(a.get<A0>());
 		(dynamic_cast<L &>(l).*func)(values);
 	}
 
@@ -169,137 +167,6 @@ public:
 };
 
 
-template<typename L, typename A0, typename A1>
-class LoaderFunc2: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1);
-
-	FuncType func;
-
-public:
-	LoaderFunc2(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2>
-class LoaderFunc3: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1, A2);
-
-	FuncType func;
-
-public:
-	LoaderFunc3(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2, typename A3>
-class LoaderFunc4: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3);
-
-	FuncType func;
-
-public:
-	LoaderFunc4(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		result += TypeInfo<A3>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
-class LoaderFunc5: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3, A4);
-
-	FuncType func;
-
-public:
-	LoaderFunc5(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>(), st.args[4].get<A4>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3), as.get<A4>(4));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		result += TypeInfo<A3>::signature;
-		result += TypeInfo<A4>::signature;
-		return result;
-	}
-};
-
-
-#if __cplusplus>=201103L
 template<unsigned I, typename... Args>
 struct Apply;
 
@@ -367,7 +234,7 @@ class LoaderFuncNBound1: public LoaderAction
 {
 protected:
 	typedef void (L::*FuncType)(B0, Args...);
-	typedef typename RemoveReference<B0>::Type Bound0Type;
+	typedef typename std::remove_reference<B0>::type Bound0Type;
 
 	FuncType func;
 	Bound0Type bound0;
@@ -388,7 +255,6 @@ public:
 	virtual std::string get_signature() const
 	{ return create_signature<Args...>(); }
 };
-#endif
 
 
 template<typename L, typename T0>