X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Finstancelib.h;h=af9dd2bba31a181f3eb6b4e7c24f7e4c93cf8ed1;hb=fa5abd8c4ea119b7d60056122cbbd7b02dde4260;hp=913288b6a9b127b90566412d78f96f3f13ad5c70;hpb=3c73487420fde8d4a3b5360d8b99e48132517900;p=xonotic%2Fnetradiant.git

diff --git a/libs/instancelib.h b/libs/instancelib.h
index 913288b6..af9dd2bb 100644
--- a/libs/instancelib.h
+++ b/libs/instancelib.h
@@ -135,14 +135,14 @@ void transformChanged(){
 		( *i ).second->transformChanged();
 	}
 }
-typedef MemberCaller<InstanceSet, &InstanceSet::transformChanged> TransformChangedCaller;
+typedef MemberCaller<InstanceSet, void(), &InstanceSet::transformChanged> TransformChangedCaller;
 void boundsChanged(){
 	for ( InstanceMap::iterator i = m_instances.begin(); i != m_instances.end(); ++i )
 	{
 		( *i ).second->boundsChanged();
 	}
 }
-typedef MemberCaller<InstanceSet, &InstanceSet::boundsChanged> BoundsChangedCaller;
+typedef MemberCaller<InstanceSet, void(), &InstanceSet::boundsChanged> BoundsChangedCaller;
 };
 
 template<typename Functor>
@@ -153,23 +153,16 @@ inline void InstanceSet_forEach( InstanceSet& instances, const Functor& functor
 	}
 }
 
-template<typename Type>
-class InstanceEvaluateTransform
-{
-public:
-inline void operator()( scene::Instance& instance ) const {
-	InstanceTypeCast<Type>::cast( instance )->evaluateTransform();
-}
-};
-
 template<typename Type>
 class InstanceSetEvaluateTransform
 {
 public:
 static void apply( InstanceSet& instances ){
-	InstanceSet_forEach( instances, InstanceEvaluateTransform<Type>() );
+	InstanceSet_forEach(instances, [&](scene::Instance &instance) {
+		InstanceTypeCast<Type>::cast(instance)->evaluateTransform();
+	});
 }
-typedef ReferenceCaller<InstanceSet, &InstanceSetEvaluateTransform<Type>::apply> Caller;
+typedef ReferenceCaller<InstanceSet, void(), &InstanceSetEvaluateTransform<Type>::apply> Caller;
 };
 
 #endif