atria-soft/zeus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] some clean

Browse Source
This commit is contained in:
Edouard DUPIN 2016-05-19 22:00:35 +02:00
parent 5342ac68b1
commit 33c78cc567
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jus/Service.h
View File

@ -95,8 +95,6 @@ ejson::Value convertToJson(const JUS_TYPE& _value);
template <class JUS_RETURN, class... JUS_TYPES> template <class JUS_RETURN, class... JUS_TYPES>
class TypeList: public CmdBase { class TypeList: public CmdBase {
protected:
//int32_t m_sizeParam;
public: public:
using functionType = JUS_RETURN (*)(JUS_TYPES...); using functionType = JUS_RETURN (*)(JUS_TYPES...);
functionType m_function; functionType m_function;
@ -106,8 +104,7 @@ class TypeList: public CmdBase {
m_function(_fptr) { m_function(_fptr) {
} }
//template <typename std::enable_if<!std::is_same<JUS_RETURN, void>::value>::type > ejson::Value execute(const ejson::Array& _params) {
ejson::Value execute2(const ejson::Array& _params) {
ejson::Object out; ejson::Object out;
if (_params.size() != m_listParamType.size()) { if (_params.size() != m_listParamType.size()) {
JUS_ERROR("Wrong number of Parameters ..."); JUS_ERROR("Wrong number of Parameters ...");
@ -137,16 +134,10 @@ class TypeList: public CmdBase {
out.add("return", retVal); out.add("return", retVal);
return out; return out;
} }
ejson::Value execute(const ejson::Array& _params) override {
return execute2(_params);
}
}; };
// Void special case : // Void special case:
template <class... JUS_TYPES> template <class... JUS_TYPES>
class TypeListVoid: public CmdBase { class TypeListVoid: public CmdBase {
protected:
//int32_t m_sizeParam;
public: public:
using functionType = void (*)(JUS_TYPES...); using functionType = void (*)(JUS_TYPES...);
functionType m_function; functionType m_function;