Use C++11 features to manipulate containers

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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index c7c593829a1b24a3ccd161dad400f14b06d207e8..4666687e71534fd15d63499898ce9217250f4ee9 100644 (file)
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -113,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);
        }
 
@@ -234,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;