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

Fixed handling of const objects in Callback class 

Before, the following results in a compilation error:

    const struct Object *obj;
    void obj_doit(const Object *obj);

    Callback<void()> cb(obj, obj_doit);

This is especially noticable when migrating from the old Thread
constructor, which previously _required_ const.

Short term fix for all cv qualifiers through a C cast:
void *_obj = (void*)obj;
pull/2190/head
Christopher Haster 2016-07-18 15:51:07 -05:00
parent 48c1d2eb7a
commit e806b89df6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hal/api/Callback.h
View File

@ -80,7 +80,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*, A0, A1, A2, A3, A4)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}
@ -221,7 +221,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*, A0, A1, A2, A3)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}
@ -362,7 +362,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*, A0, A1, A2)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}
@ -503,7 +503,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*, A0, A1)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}
@ -644,7 +644,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*, A0)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}
@ -785,7 +785,7 @@ public:
*/
template <typename T>
void attach(T *obj, R (*func)(T*)) {
_obj = static_cast<void*>(obj);
_obj = (void*)obj;
memcpy(&_func, &func, sizeof func);
_thunk = &Callback::_boundthunk<T>;
}