Require C++11 for building

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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 7e4feac613eba7afab54fec62c07b294c28f56ea..c7c593829a1b24a3ccd161dad400f14b06d207e8 100644 (file)
--- 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;
 
@@ -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;
 
@@ -361,7 +228,33 @@ public:
        { return create_signature<Args...>(); }
 };
 
-#endif
+
+template<typename L, typename B0, typename... Args>
+class LoaderFuncNBound1: public LoaderAction
+{
+protected:
+       typedef void (L::*FuncType)(B0, Args...);
+       typedef typename RemoveReference<B0>::Type Bound0Type;
+
+       FuncType func;
+       Bound0Type bound0;
+
+public:
+       LoaderFuncNBound1(FuncType f, const Bound0Type &b0): func(f), bound0(b0) { }
+
+       virtual void execute(Loader &l, const Statement &st) const
+       {
+               Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st, bound0);
+       }
+
+       virtual void execute(Loader &l, const ArgumentStore &as) const
+       {
+               Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as, bound0);
+       }
+
+       virtual std::string get_signature() const
+       { return create_signature<Args...>(); }
+};
 
 
 template<typename L, typename T0>