X-Git-Url: https://git.dlugolecki.net.pl/?p=command.git;a=blobdiff_plain;f=include%2Fcallable.h;h=f4d9e084cabe385dfcee6cfbfb0adcf87016e551;hp=4ac1bd97635e43d8b9956b35857155e59ba0ec1e;hb=ae6743a2a2c69b7a927f64ff1d3abf38a5e7d4bc;hpb=948c501fbb8d47898a9c92697327c5ffa70a898f diff --git a/include/callable.h b/include/callable.h index 4ac1bd9..f4d9e08 100644 --- a/include/callable.h +++ b/include/callable.h @@ -2,6 +2,7 @@ #define __COMMAND_CALLABLE_H #include +#include namespace command { /** @@ -13,7 +14,8 @@ namespace command { /** * Function handling user Arguments */ - void (*func)(ParameterType); +// void (*func)(ParameterType); + std::function func; public: /** @@ -21,7 +23,11 @@ namespace command { * * @param function Function that will be invoked */ - Callable(void (*function)(ParameterType)) +// Callable(void (*function)(ParameterType)) +// : func(function) { +// } + + Callable(std::function function) : func(function) { } @@ -48,7 +54,8 @@ namespace command { /** * Function handling user Arguments */ - void (*func)(void); +// void (*func)(void); + std::function func; public: /** @@ -56,9 +63,14 @@ namespace command { * * @param function Function that will be invoked */ - Callable(void (*function)(void)) +// Callable(void (*function)(void)) +// : func(function) { +// } + + Callable(std::function function) : func(function) { } + virtual ~Callable() { } protected: