Require C++11 for building

diff --git a/Build b/Build
index 147d82f07e8a075cf3ca0526223523a9e0b7004c..d934f3f35da60135ad1eed2a406438f227e127f7 100644 (file)
--- a/Build
+++ b/Build
@@ -6,6 +6,11 @@ package "mspdatafile"
        require "mspcore";
        require "sigc++-2.0";
 
+       build_info
+       {
+               standard CXX "c++11";
+       };
+
        library "mspdatafile"
        {
                source "source";

diff --git a/source/loader.h b/source/loader.h
index cf2b5454b907a038e66745a7ecd7fadf239dcf56..574ecce0c11b5bac9af56d82b6a0782a5288d8b6 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -108,36 +108,15 @@ protected:
        void add(const std::string &k, void (L::*func)(A0))
        { add(k, new LoaderFunc1<L, A0>(func)); }
 
-#if __cplusplus>=201103L
        template<typename L, typename... Args>
        void add(const std::string &k, void (L::*func)(Args...))
        { add(k, new LoaderFuncN<L, Args...>(func)); }
 
-#else
-       template<typename L, typename A0, typename A1>
-       void add(const std::string &k, void (L::*func)(A0, A1))
-       { add(k, new LoaderFunc2<L, A0, A1>(func)); }
-
-       template<typename L, typename A0, typename A1, typename A2>
-       void add(const std::string &k, void (L::*func)(A0, A1, A2))
-       { add(k, new LoaderFunc3<L, A0, A1, A2>(func)); }
-
-       template<typename L, typename A0, typename A1, typename A2, typename A3>
-       void add(const std::string &k, void (L::*func)(A0, A1, A2, A3))
-       { add(k, new LoaderFunc4<L, A0, A1, A2, A3>(func)); }
-
-       template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
-       void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4))
-       { add(k, new LoaderFunc5<L, A0, A1, A2, A3, A4>(func)); }
-#endif
-
-#if __cplusplus>=201103L
        /** Adds a keyword that is loaded by calling a function with a bound
        first argument. */
        template<typename L, typename B0, typename... Args>
        void add(const std::string &k, void (L::*func)(B0, Args...), const typename RemoveReference<B0>::Type &b0)
        { add(k, new LoaderFuncNBound1<L, B0, Args...>(func, b0)); }
-#endif
 
        /** Adds a keyword that is loaded into a member of the loaded object. */
        template<typename L, typename T0>
@@ -176,7 +155,6 @@ protected:
 };
 
 
-#if __cplusplus>=201103L
 /**
 Loads an object from a file.  The object must have a public Loader class.  Any
 extra arguments are passed to the Loader constructor.
@@ -224,36 +202,6 @@ typename EnableIf<NeedsCollection<typename T::Loader>::value, void>::No load(T &
        loader.load(parser);
 }
 
-#else
-
-/**
-Loads an object from a file.  The object must have a public Loader class.
-*/
-template<typename T>
-void load(T &obj, const std::string &fn)
-{
-       IO::BufferedFile in(fn);
-
-       Parser parser(in, fn);
-       typename T::Loader loader(obj);
-       loader.load(parser);
-}
-
-/**
-Loads an object from a file, passing one extra argument to the Loader
-constructor.  The object must have a public Loader class.
-*/
-template<typename T, typename U>
-void load(T &obj, const std::string &fn, U &arg)
-{
-       IO::BufferedFile in(fn);
-
-       Parser parser(in, fn);
-       typename T::Loader loader(obj, arg);
-       loader.load(parser);
-}
-#endif
-
 } // namespace DataFile
 } // namespace Msp
 

diff --git a/source/loaderaction.h b/source/loaderaction.h
index a3b04437d279e3e6835bd20538d2c99311721064..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;
 
@@ -388,7 +255,6 @@ public:
        virtual std::string get_signature() const
        { return create_signature<Args...>(); }
 };
-#endif
 
 
 template<typename L, typename T0>