*/
-#ifndef CALLER_H
-#define CALLER_H
+#pragma once
-/* Pending some sort of C++11 support */
-#if 0
+#if defined HAS_CXX11_VARIADIC_TEMPLATES
template<typename ReturnType, typename... Args> class CoreExport Handler : public classbase
{
#define caller8 Caller
#define DEFINE_HANDLER0(NAME, RETURN) \
- class CoreExport NAME : public Handler<RETURN> { public: NAME() { } virtual RETURN Call(); }
+ class CoreExport NAME : public Handler<RETURN> { public: RETURN Call() CXX11_OVERRIDE; }
#define DEFINE_HANDLER1(NAME, RETURN, V1) \
- class CoreExport NAME : public Handler<RETURN, V1> { public: NAME() { } virtual RETURN Call(V1); }
+ class CoreExport NAME : public Handler<RETURN, V1> { public: RETURN Call(V1) CXX11_OVERRIDE; }
#define DEFINE_HANDLER2(NAME, RETURN, V1, V2) \
- class CoreExport NAME : public Handler<RETURN, V1, V2> { public: NAME() { } virtual RETURN Call(V1, V2); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2> { public: RETURN Call(V1, V2) CXX11_OVERRIDE; }
#define DEFINE_HANDLER3(NAME, RETURN, V1, V2, V3) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3> { public: NAME() { } virtual RETURN Call(V1, V2, V3); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3> { public: RETURN Call(V1, V2, V3) CXX11_OVERRIDE; }
#define DEFINE_HANDLER4(NAME, RETURN, V1, V2, V3, V4) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4> { public: RETURN Call(V1, V2, V3, V4) CXX11_OVERRIDE; }
#define DEFINE_HANDLER5(NAME, RETURN, V1, V2, V3, V4, V5) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5> { public: RETURN Call(V1, V2, V3, V4, V5) CXX11_OVERRIDE; }
#define DEFINE_HANDLER6(NAME, RETURN, V1, V2, V3, V4, V5, V6) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6> { public: RETURN Call(V1, V2, V3, V4, V5, V6) CXX11_OVERRIDE; }
#define DEFINE_HANDLER7(NAME, RETURN, V1, V2, V3, V4, V5, V6, V7) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7> { public: RETURN Call(V1, V2, V3, V4, V5, V6, V7) CXX11_OVERRIDE; }
#define DEFINE_HANDLER8(NAME, RETURN, V1, V2, V3, V4, V5, V6, V7, V8) \
- class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8); }
+ class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8) CXX11_OVERRIDE; }
#else
virtual ~HandlerBase8() { }
};
-template <typename HandlerType> class CoreExport caller
+template <typename HandlerType> class caller
{
public:
HandlerType* target;
virtual ~caller() { }
};
-template <typename ReturnType> class CoreExport caller0 : public caller< HandlerBase0<ReturnType> >
+template <typename ReturnType> class caller0 : public caller< HandlerBase0<ReturnType> >
{
public:
caller0(HandlerBase0<ReturnType>* initial)
: caller< HandlerBase0<ReturnType> >::caller(initial)
{ }
- virtual ReturnType operator() ()
+ ReturnType operator() ()
{
return this->target->Call();
}
};
-template <typename ReturnType, typename Param1> class CoreExport caller1 : public caller< HandlerBase1<ReturnType, Param1> >
+template <typename ReturnType, typename Param1> class caller1 : public caller< HandlerBase1<ReturnType, Param1> >
{
public:
caller1(HandlerBase1<ReturnType, Param1>* initial)
: caller< HandlerBase1<ReturnType, Param1> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1)
+ ReturnType operator() (Param1 param1)
{
return this->target->Call(param1);
}
};
-template <typename ReturnType, typename Param1, typename Param2> class CoreExport caller2 : public caller< HandlerBase2<ReturnType, Param1, Param2> >
+template <typename ReturnType, typename Param1, typename Param2> class caller2 : public caller< HandlerBase2<ReturnType, Param1, Param2> >
{
public:
caller2(HandlerBase2<ReturnType, Param1, Param2>* initial)
: caller< HandlerBase2<ReturnType, Param1, Param2> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2)
+ ReturnType operator() (Param1 param1, Param2 param2)
{
return this->target->Call(param1, param2);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3> class CoreExport caller3 : public caller< HandlerBase3<ReturnType, Param1, Param2, Param3> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3> class caller3 : public caller< HandlerBase3<ReturnType, Param1, Param2, Param3> >
{
public:
caller3(HandlerBase3<ReturnType, Param1, Param2, Param3>* initial)
: caller< HandlerBase3<ReturnType, Param1, Param2, Param3> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3)
{
return this->target->Call(param1, param2, param3);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4> class CoreExport caller4 : public caller< HandlerBase4<ReturnType, Param1, Param2, Param3, Param4> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4> class caller4 : public caller< HandlerBase4<ReturnType, Param1, Param2, Param3, Param4> >
{
public:
caller4(HandlerBase4<ReturnType, Param1, Param2, Param3, Param4>* initial)
: caller< HandlerBase4<ReturnType, Param1, Param2, Param3, Param4> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4)
{
return this->target->Call(param1, param2, param3, param4);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5> class CoreExport caller5 : public caller< HandlerBase5<ReturnType, Param1, Param2, Param3, Param4, Param5> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5> class caller5 : public caller< HandlerBase5<ReturnType, Param1, Param2, Param3, Param4, Param5> >
{
public:
caller5(HandlerBase5<ReturnType, Param1, Param2, Param3, Param4, Param5>* initial)
: caller< HandlerBase5<ReturnType, Param1, Param2, Param3, Param4, Param5> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5)
{
return this->target->Call(param1, param2, param3, param4, param5);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6> class CoreExport caller6 : public caller< HandlerBase6<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6> class caller6 : public caller< HandlerBase6<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6> >
{
public:
caller6(HandlerBase6<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6>* initial)
: caller< HandlerBase6<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6)
{
return this->target->Call(param1, param2, param3, param4, param5, param6);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7> class CoreExport caller7 : public caller< HandlerBase7<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7> class caller7 : public caller< HandlerBase7<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7> >
{
public:
caller7(HandlerBase7<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7>* initial)
: caller< HandlerBase7<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6, Param7 param7)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6, Param7 param7)
{
return this->target->Call(param1, param2, param3, param4, param5, param6, param7);
}
};
-template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7, typename Param8> class CoreExport caller8 : public caller< HandlerBase8<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8> >
+template <typename ReturnType, typename Param1, typename Param2, typename Param3, typename Param4, typename Param5, typename Param6, typename Param7, typename Param8> class caller8 : public caller< HandlerBase8<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8> >
{
public:
caller8(HandlerBase8<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8>* initial)
: caller< HandlerBase8<ReturnType, Param1, Param2, Param3, Param4, Param5, Param6, Param7, Param8> >(initial)
{ }
- virtual ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6, Param7 param7, Param8 param8)
+ ReturnType operator() (Param1 param1, Param2 param2, Param3 param3, Param4 param4, Param5 param5, Param6 param6, Param7 param7, Param8 param8)
{
return this->target->Call(param1, param2, param3, param4, param5, param6, param7, param8);
}
class CoreExport NAME : public HandlerBase8<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: NAME() { } virtual ~NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8); }
#endif
-
-#endif