ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13015 from jeromecoutant/PR_IARTRIVIAL 

Force callback non-trivial for IAR
pull/13077/head
Martin Kojtal 2020-06-05 10:45:21 +02:00 committed by GitHub
parent 8ff3c95b2d d8fc1e9121
commit dc30e1bf60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platform/Callback.h
View File

@ -30,6 +30,13 @@
// MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL - support storing non-trivial function objects // MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL - support storing non-trivial function objects
// MBED_CONF_PLATFORM_CALLBACK_COMPARABLE - support memcmp comparing stored objects (requires zero padding) // MBED_CONF_PLATFORM_CALLBACK_COMPARABLE - support memcmp comparing stored objects (requires zero padding)
#ifdef __ICCARM__
/* Force platform.callback-nontrivial for IAR */
#undef MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL
#define MBED_CONF_PLATFORM_CALLBACK_NONTRIVIAL 1
#endif
namespace mbed { namespace mbed {
/** \addtogroup platform-public-api */ /** \addtogroup platform-public-api */
/** @{*/ /** @{*/

2
platform/mbed_lib.json
View File

@ -119,7 +119,7 @@
"value": 8 "value": 8
}, },
"callback-nontrivial": { "callback-nontrivial": {
"help": "Enables support for non-trivial callable objects in Callback. Can be disabled to save ROM if no-one is using non-trivial types. Changing this value may cause incompatibility with pre-built binaries.", "help": "Enables support for non-trivial callable objects in Callback. Can be disabled to save ROM if no-one is using non-trivial types. Changing this value may cause incompatibility with pre-built binaries. Choice not available with IAR, value forced to true.",
"value": false "value": false
}, },
"callback-comparable": { "callback-comparable": {