template <class Ptr, class Class, class Res, class... ArgTypes>
Function<Res (ArgTypes...)> MemFn(Ptr object, Res (Class::*method)(ArgTypes...))
{
	return [=](ArgTypes... args) { return (object->*method)(args...); };
}

#include <Core/Core.h>

using namespace Upp;

// Temporary fix:

template <class Ptr, class Class, class Res, class... ArgTypes>
Function<Res (ArgTypes...)> MemFn2(Ptr object, Res (Class::*method)(ArgTypes...))
{
	return [=](ArgTypes... args) { return (object->*method)(args...); };
}

#define THISFN2(x)   MemFn2(this, &CLASSNAME::x)


// Testcase for MemFn

class MemFnTest{
	typedef MemFnTest CLASSNAME;

	String fn1(double a, double b, String &c){
		String s=Format("%f %f %s\r\n",a,b,~c);
		return s;
	}
	
public:
	Function<String (double,double,String&)> fn;
	
	MemFnTest(){
		fn=THISFN2(fn1);
		fn=THISFN(fn1);
	}
};

CONSOLE_APP_MAIN{
	MemFnTest x;
	String s = x.fn(1,2,String("Hi there!"));
	printf(s);
}