Christopher Haster / mbed-hal

Dependencies:   target-freescale

Fork of mbed-hal by Morpheus

Revision:
16:086d28575041
Parent:
13:d6551a5dcbbf
--- a/api/InterruptIn.h	Fri Apr 01 01:16:52 2016 -0500
+++ b/api/InterruptIn.h	Fri Apr 01 01:22:54 2016 -0500
@@ -72,7 +72,7 @@
      *
      *  @param fptr A pointer to a void function, or 0 to set as none
      */
-    void rise(FunctionPointer fptr);
+    void rise(FuncPtr<void()> fptr);
 
     /** Attach a member function to call when a rising edge occurs on the input
      *
@@ -81,14 +81,14 @@
      */
     template<typename T, typename M>
     void rise(T *tptr, M *mptr) {
-        rise(FunctionPointer(tptr, mptr));
+        rise(FuncPtr<void()>(tptr, mptr));
     }
 
     /** Attach a function to call when a falling edge occurs on the input
      *
      *  @param fptr A pointer to a void function, or 0 to set as none
      */
-    void fall(FunctionPointer fptr);
+    void fall(FuncPtr<void()> fptr);
 
     /** Attach a member function to call when a falling edge occurs on the input
      *
@@ -97,7 +97,7 @@
      */
     template<typename T, typename M>
     void fall(T *tptr, M *mptr) {
-        fall(FunctionPointer(tptr, mptr));
+        fall(FuncPtr<void()>(tptr, mptr));
     }
 
     /** Set the input pin mode
@@ -122,8 +122,8 @@
     gpio_t gpio;
     gpio_irq_t gpio_irq;
 
-    FunctionPointer _rise;
-    FunctionPointer _fall;
+    FuncPtr<void()> _rise;
+    FuncPtr<void()> _fall;
 };
 
 } // namespace mbed