Diff: mbed-client-wrapper.h

Revision:

12:26810c6b58e1

Parent:

4:0f9eae5739dd

--- a/mbed-client-wrapper.h	Wed Aug 24 19:05:56 2016 +0200
+++ b/mbed-client-wrapper.h	Wed Sep 28 11:16:43 2016 +0300
@@ -47,7 +47,7 @@
 class MbedClient: public M2MInterfaceObserver {
 public:
     // constructor for MbedClient object, initialize private variables
-    MbedClient(struct MbedClientOptions options, FP1<void, string> onValueChanged, bool debug) :
+    MbedClient(struct MbedClientOptions options, Callback<void(string)> onValueChanged, bool debug) :
         _onValueChanged(onValueChanged), _debug(debug)
     {
         _interface = NULL;
@@ -78,11 +78,11 @@
         if (_debug) printf("[SMC] %s\r\n", str);
     }
 
-    void set_registered_function(FunctionPointer onRegistered) {
+    void set_registered_function(Callback<void()> onRegistered) {
         _onRegistered = onRegistered;
     }
 
-    void set_unregistered_function(FunctionPointer onUnregistered) {
+    void set_unregistered_function(Callback<void()> onUnregistered) {
         _onUnregistered = onUnregistered;
     }
 
@@ -321,9 +321,9 @@
     volatile bool                       _unregistered;
     int                                 _value;
     struct MbedClientOptions            _options;
-    FunctionPointer                     _onRegistered;
-    FunctionPointer                     _onUnregistered;
-    FP1<void, string>                   _onValueChanged;
+    Callback<void()>                    _onRegistered;
+    Callback<void()>                    _onUnregistered;
+    Callback<void(string)>              _onValueChanged;
     bool                                _debug;
 };