Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 21:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_UAVCAN: fix typedef for callback methods

Browse Source
This commit is contained in:
Siddharth Purohit 2019-03-23 15:30:07 +11:00 committed by Andrew Tridgell
parent 3869507839
commit d93453f5f9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_UAVCAN/AP_UAVCAN.h
View File

@ -52,9 +52,10 @@
*/ */
#define UC_REGISTRY_BINDER(ClassName_, DataType_) \ #define UC_REGISTRY_BINDER(ClassName_, DataType_) \
class ClassName_ : public AP_UAVCAN::RegistryBinder<DataType_> { \ class ClassName_ : public AP_UAVCAN::RegistryBinder<DataType_> { \
typedef void (*CN_Registry)(AP_UAVCAN*, uint8_t, const ClassName_&); \
public: \ public: \
ClassName_() : RegistryBinder() {} \ ClassName_() : RegistryBinder() {} \
ClassName_(AP_UAVCAN* uc, void (*ffunc)(AP_UAVCAN*, uint8_t, const ClassName_&)) : \ ClassName_(AP_UAVCAN* uc, CN_Registry ffunc) : \
RegistryBinder(uc, (Registry)ffunc) {} \ RegistryBinder(uc, (Registry)ffunc) {} \
} }
@ -84,7 +85,7 @@ public:
template <typename DataType_> template <typename DataType_>
class RegistryBinder { class RegistryBinder {
protected: protected:
typedef void* (*Registry)(AP_UAVCAN* _ap_uavcan, uint8_t _node_id, const RegistryBinder& _cb); typedef void (*Registry)(AP_UAVCAN* _ap_uavcan, uint8_t _node_id, const RegistryBinder& _cb);
AP_UAVCAN* _uc; AP_UAVCAN* _uc;
Registry _ffunc; Registry _ffunc;