Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Menu: removed BUILD_DELEGATES code 

no longer needed
This commit is contained in:
Andrew Tridgell 2015-05-26 14:34:47 +10:00
parent 1a2b02a563
commit 85f87b6d9c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Menu/AP_Menu.h
View File

@ -58,8 +58,6 @@ public:
/// ///
#if APM_BUILD_FUNCTOR #if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(func, int8_t, uint8_t, const struct arg *); FUNCTOR_TYPEDEF(func, int8_t, uint8_t, const struct arg *);
#elif APM_BUILD_DELEGATES
typedef DELEGATE_FUNCTION2(int8_t, uint8_t, const struct arg *) func;
#else #else
typedef int8_t (*func)(uint8_t argc, const struct arg *argv); typedef int8_t (*func)(uint8_t argc, const struct arg *argv);
#endif #endif
@ -77,8 +75,6 @@ public:
/// ///
#if APM_BUILD_FUNCTOR #if APM_BUILD_FUNCTOR
FUNCTOR_TYPEDEF(preprompt, bool); FUNCTOR_TYPEDEF(preprompt, bool);
#elif APM_BUILD_DELEGATES
typedef DELEGATE_FUNCTION0(bool) preprompt;
#else #else
typedef bool (*preprompt)(void); typedef bool (*preprompt)(void);
#endif #endif
@ -104,8 +100,6 @@ public:
/// ///
#if APM_BUILD_FUNCTOR #if APM_BUILD_FUNCTOR
FUNCTOR_DECLARE(func, int8_t, uint8_t, const struct arg *); FUNCTOR_DECLARE(func, int8_t, uint8_t, const struct arg *);
#elif APM_BUILD_DELEGATES
DELEGATE_FUNCTION2(int8_t, uint8_t, const struct arg *) func;
#else #else
int8_t (*func)(uint8_t argc, const struct arg *argv); int8_t (*func)(uint8_t argc, const struct arg *argv);
#endif #endif