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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index c7c5938..4666687 100644
--- 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;