@@ -27,33 +27,25 @@ FSTR(RANGE, rangeValueDelta); // "rangeValueDelta"
27
27
* @snippet callbacks.cpp onRangeValue
28
28
**/
29
29
30
- using GenericRangeValueCallback_int = std::function< bool ( const String &, const String &, int &)> ;
31
- using GenericRangeValueCallback_float = std::function< bool ( const String &, const String &, float &)> ;
30
+ using GenericRangeValueCallback_int = bool (*)( const String &, const String &, int &);
31
+ using GenericRangeValueCallback_float = bool (*)( const String &, const String &, float &);
32
32
33
33
struct GenericRangeValueCallback {
34
34
GenericRangeValueCallback () : type(type_unknown) {}
35
- GenericRangeValueCallback (GenericRangeValueCallback_int cb) : type(type_int), callback(cb) {}
36
- GenericRangeValueCallback (GenericRangeValueCallback_float cb) : type(type_float), callback(cb) {}
37
- ~GenericRangeValueCallback () {};
38
- GenericRangeValueCallback& operator =(const GenericRangeValueCallback& other) { this ->callback = other.callback ; this ->type = other.type ; return *this ; };
35
+ GenericRangeValueCallback (GenericRangeValueCallback_int cb) : type(type_int), cb_int(cb) {}
36
+ GenericRangeValueCallback (GenericRangeValueCallback_float cb) : type(type_float), cb_float(cb) {}
39
37
enum {
40
38
type_unknown,
41
39
type_int,
42
40
type_float
43
41
} type;
44
- union Callback {
45
- Callback () {};
46
- Callback (const GenericRangeValueCallback_int& cb) : cb_int (cb) {};
47
- Callback (const GenericRangeValueCallback_float& cb) : cb_float (cb) {};
48
- Callback& operator =(const Callback& other) { cb_int = other.cb_int ; return *this ; }
49
- ~Callback (){};
50
-
42
+ union {
51
43
GenericRangeValueCallback_int cb_int;
52
44
GenericRangeValueCallback_float cb_float;
53
- } callback ;
45
+ };
54
46
};
55
47
56
- using SetRangeValueCallback = std::function< bool ( const String &, int &)> ;
48
+ using SetRangeValueCallback = bool (*)( const String &, int &);
57
49
58
50
/* *
59
51
* @brief Callback definition for onRangeValue function on a specific instance
0 commit comments