diff --git a/TESTS/mbed_functional/callback/main.cpp b/TESTS/mbed_functional/callback/main.cpp index 6f6b7da4f76..6dd1ecca434 100644 --- a/TESTS/mbed_functional/callback/main.cpp +++ b/TESTS/mbed_functional/callback/main.cpp @@ -328,7 +328,7 @@ void test_dispatch0() { Verifier::verify0((const Thing*)&thing, &const_void_func0); Verifier::verify0((volatile Thing*)&thing, &volatile_void_func0); Verifier::verify0((const volatile Thing*)&thing, &const_volatile_void_func0); - Verifier::verify0(callback(static_func0)); + Verifier::verify0(mbed_callback(static_func0)); Callback cb(static_func0); Verifier::verify0(cb); @@ -355,7 +355,7 @@ void test_dispatch1() { Verifier::verify1((const Thing*)&thing, &const_void_func1); Verifier::verify1((volatile Thing*)&thing, &volatile_void_func1); Verifier::verify1((const volatile Thing*)&thing, &const_volatile_void_func1); - Verifier::verify1(callback(static_func1)); + Verifier::verify1(mbed_callback(static_func1)); Callback cb(static_func1); Verifier::verify1(cb); @@ -382,7 +382,7 @@ void test_dispatch2() { Verifier::verify2((const Thing*)&thing, &const_void_func2); Verifier::verify2((volatile Thing*)&thing, &volatile_void_func2); Verifier::verify2((const volatile Thing*)&thing, &const_volatile_void_func2); - Verifier::verify2(callback(static_func2)); + Verifier::verify2(mbed_callback(static_func2)); Callback cb(static_func2); Verifier::verify2(cb); @@ -409,7 +409,7 @@ void test_dispatch3() { Verifier::verify3((const Thing*)&thing, &const_void_func3); Verifier::verify3((volatile Thing*)&thing, &volatile_void_func3); Verifier::verify3((const volatile Thing*)&thing, &const_volatile_void_func3); - Verifier::verify3(callback(static_func3)); + Verifier::verify3(mbed_callback(static_func3)); Callback cb(static_func3); Verifier::verify3(cb); @@ -436,7 +436,7 @@ void test_dispatch4() { Verifier::verify4((const Thing*)&thing, &const_void_func4); Verifier::verify4((volatile Thing*)&thing, &volatile_void_func4); Verifier::verify4((const volatile Thing*)&thing, &const_volatile_void_func4); - Verifier::verify4(callback(static_func4)); + Verifier::verify4(mbed_callback(static_func4)); Callback cb(static_func4); Verifier::verify4(cb); @@ -463,7 +463,7 @@ void test_dispatch5() { Verifier::verify5((const Thing*)&thing, &const_void_func5); Verifier::verify5((volatile Thing*)&thing, &volatile_void_func5); Verifier::verify5((const volatile Thing*)&thing, &const_volatile_void_func5); - Verifier::verify5(callback(static_func5)); + Verifier::verify5(mbed_callback(static_func5)); Callback cb(static_func5); Verifier::verify5(cb); diff --git a/TESTS/mbed_functional/callback_big/main.cpp b/TESTS/mbed_functional/callback_big/main.cpp index 47630a3f21c..f42771a6903 100644 --- a/TESTS/mbed_functional/callback_big/main.cpp +++ b/TESTS/mbed_functional/callback_big/main.cpp @@ -202,7 +202,7 @@ void test_dispatch0() { Verifier::verify0((const Thing*)&thing, &const_func0); Verifier::verify0((volatile Thing*)&thing, &volatile_func0); Verifier::verify0((const volatile Thing*)&thing, &const_volatile_func0); - Verifier::verify0(callback(static_func0)); + Verifier::verify0(mbed_callback(static_func0)); Callback cb(static_func0); Verifier::verify0(cb); @@ -225,7 +225,7 @@ void test_dispatch1() { Verifier::verify1((const Thing*)&thing, &const_func1); Verifier::verify1((volatile Thing*)&thing, &volatile_func1); Verifier::verify1((const volatile Thing*)&thing, &const_volatile_func1); - Verifier::verify1(callback(static_func1)); + Verifier::verify1(mbed_callback(static_func1)); Callback cb(static_func1); Verifier::verify1(cb); @@ -248,7 +248,7 @@ void test_dispatch2() { Verifier::verify2((const Thing*)&thing, &const_func2); Verifier::verify2((volatile Thing*)&thing, &volatile_func2); Verifier::verify2((const volatile Thing*)&thing, &const_volatile_func2); - Verifier::verify2(callback(static_func2)); + Verifier::verify2(mbed_callback(static_func2)); Callback cb(static_func2); Verifier::verify2(cb); @@ -271,7 +271,7 @@ void test_dispatch3() { Verifier::verify3((const Thing*)&thing, &const_func3); Verifier::verify3((volatile Thing*)&thing, &volatile_func3); Verifier::verify3((const volatile Thing*)&thing, &const_volatile_func3); - Verifier::verify3(callback(static_func3)); + Verifier::verify3(mbed_callback(static_func3)); Callback cb(static_func3); Verifier::verify3(cb); @@ -294,7 +294,7 @@ void test_dispatch4() { Verifier::verify4((const Thing*)&thing, &const_func4); Verifier::verify4((volatile Thing*)&thing, &volatile_func4); Verifier::verify4((const volatile Thing*)&thing, &const_volatile_func4); - Verifier::verify4(callback(static_func4)); + Verifier::verify4(mbed_callback(static_func4)); Callback cb(static_func4); Verifier::verify4(cb); @@ -317,7 +317,7 @@ void test_dispatch5() { Verifier::verify5((const Thing*)&thing, &const_func5); Verifier::verify5((volatile Thing*)&thing, &volatile_func5); Verifier::verify5((const volatile Thing*)&thing, &const_volatile_func5); - Verifier::verify5(callback(static_func5)); + Verifier::verify5(mbed_callback(static_func5)); Callback cb(static_func5); Verifier::verify5(cb); diff --git a/TESTS/mbed_functional/callback_small/main.cpp b/TESTS/mbed_functional/callback_small/main.cpp index e5fa15b4b68..263c090ac44 100644 --- a/TESTS/mbed_functional/callback_small/main.cpp +++ b/TESTS/mbed_functional/callback_small/main.cpp @@ -202,7 +202,7 @@ void test_dispatch0() { Verifier::verify0((const Thing*)&thing, &const_func0); Verifier::verify0((volatile Thing*)&thing, &volatile_func0); Verifier::verify0((const volatile Thing*)&thing, &const_volatile_func0); - Verifier::verify0(callback(static_func0)); + Verifier::verify0(mbed_callback(static_func0)); Callback cb(static_func0); Verifier::verify0(cb); @@ -225,7 +225,7 @@ void test_dispatch1() { Verifier::verify1((const Thing*)&thing, &const_func1); Verifier::verify1((volatile Thing*)&thing, &volatile_func1); Verifier::verify1((const volatile Thing*)&thing, &const_volatile_func1); - Verifier::verify1(callback(static_func1)); + Verifier::verify1(mbed_callback(static_func1)); Callback cb(static_func1); Verifier::verify1(cb); @@ -248,7 +248,7 @@ void test_dispatch2() { Verifier::verify2((const Thing*)&thing, &const_func2); Verifier::verify2((volatile Thing*)&thing, &volatile_func2); Verifier::verify2((const volatile Thing*)&thing, &const_volatile_func2); - Verifier::verify2(callback(static_func2)); + Verifier::verify2(mbed_callback(static_func2)); Callback cb(static_func2); Verifier::verify2(cb); @@ -271,7 +271,7 @@ void test_dispatch3() { Verifier::verify3((const Thing*)&thing, &const_func3); Verifier::verify3((volatile Thing*)&thing, &volatile_func3); Verifier::verify3((const volatile Thing*)&thing, &const_volatile_func3); - Verifier::verify3(callback(static_func3)); + Verifier::verify3(mbed_callback(static_func3)); Callback cb(static_func3); Verifier::verify3(cb); @@ -294,7 +294,7 @@ void test_dispatch4() { Verifier::verify4((const Thing*)&thing, &const_func4); Verifier::verify4((volatile Thing*)&thing, &volatile_func4); Verifier::verify4((const volatile Thing*)&thing, &const_volatile_func4); - Verifier::verify4(callback(static_func4)); + Verifier::verify4(mbed_callback(static_func4)); Callback cb(static_func4); Verifier::verify4(cb); @@ -317,7 +317,7 @@ void test_dispatch5() { Verifier::verify5((const Thing*)&thing, &const_func5); Verifier::verify5((volatile Thing*)&thing, &volatile_func5); Verifier::verify5((const volatile Thing*)&thing, &const_volatile_func5); - Verifier::verify5(callback(static_func5)); + Verifier::verify5(mbed_callback(static_func5)); Callback cb(static_func5); Verifier::verify5(cb); diff --git a/features/net/network-socket/Socket.h b/features/net/network-socket/Socket.h index 39a89a529f4..b0b90f140d2 100644 --- a/features/net/network-socket/Socket.h +++ b/features/net/network-socket/Socket.h @@ -177,9 +177,9 @@ class Socket { template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The attach function does not support cv-qualifiers. Replaced by " - "attach(callback(obj, method)).") + "attach(mbed_callback(obj, method)).") void attach(T *obj, M method) { - attach(mbed::callback(obj, method)); + attach(mbed::mbed_callback(obj, method)); } protected: diff --git a/hal/api/Callback.h b/hal/api/Callback.h index c1a294bc4f3..5ae414ced6a 100644 --- a/hal/api/Callback.h +++ b/hal/api/Callback.h @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #ifndef MBED_CALLBACK_H #define MBED_CALLBACK_H @@ -2614,7 +2615,7 @@ typedef Callback event_callback_t; * @return Callback with infered type */ template -Callback callback(R (*func)() = 0) { +Callback mbed_callback(R (*func)() = 0) { return Callback(func); } @@ -2624,7 +2625,7 @@ Callback callback(R (*func)() = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -2635,7 +2636,7 @@ Callback callback(const Callback &func) { * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*)) { +Callback mbed_callback(void *obj, R (*func)(void*)) { return Callback(obj, func); } @@ -2646,7 +2647,7 @@ Callback callback(void *obj, R (*func)(void*)) { * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*)) { +Callback mbed_callback(const void *obj, R (*func)(const void*)) { return Callback(obj, func); } @@ -2657,7 +2658,7 @@ Callback callback(const void *obj, R (*func)(const void*)) { * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*)) { return Callback(obj, func); } @@ -2668,7 +2669,7 @@ Callback callback(volatile void *obj, R (*func)(volatile void*)) { * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*)) { return Callback(obj, func); } @@ -2679,7 +2680,7 @@ Callback callback(const volatile void *obj, R (*func)(const volatile void*) * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*)) { +Callback mbed_callback(T *obj, R (*func)(T*)) { return Callback(obj, func); } @@ -2690,7 +2691,7 @@ Callback callback(T *obj, R (*func)(T*)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*)) { +Callback mbed_callback(const T *obj, R (*func)(const T*)) { return Callback(obj, func); } @@ -2701,7 +2702,7 @@ Callback callback(const T *obj, R (*func)(const T*)) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*)) { return Callback(obj, func); } @@ -2712,7 +2713,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*)) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*)) { return Callback(obj, func); } @@ -2723,7 +2724,7 @@ Callback callback(const volatile T *obj, R (*func)(const volatile T*)) { * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)()) { +Callback mbed_callback(T *obj, R (T::*func)()) { return Callback(obj, func); } @@ -2734,7 +2735,7 @@ Callback callback(T *obj, R (T::*func)()) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)() const) { +Callback mbed_callback(const T *obj, R (T::*func)() const) { return Callback(obj, func); } @@ -2745,7 +2746,7 @@ Callback callback(const T *obj, R (T::*func)() const) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)() volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)() volatile) { return Callback(obj, func); } @@ -2756,7 +2757,7 @@ Callback callback(volatile T *obj, R (T::*func)() volatile) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)() const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)() const volatile) { return Callback(obj, func); } @@ -2767,7 +2768,7 @@ Callback callback(const volatile T *obj, R (T::*func)() const volatile) { * @return Callback with infered type */ template -Callback callback(R (*func)(A0) = 0) { +Callback mbed_callback(R (*func)(A0) = 0) { return Callback(func); } @@ -2777,7 +2778,7 @@ Callback callback(R (*func)(A0) = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -2788,7 +2789,7 @@ Callback callback(const Callback &func) { * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*, A0)) { +Callback mbed_callback(void *obj, R (*func)(void*, A0)) { return Callback(obj, func); } @@ -2799,7 +2800,7 @@ Callback callback(void *obj, R (*func)(void*, A0)) { * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*, A0)) { +Callback mbed_callback(const void *obj, R (*func)(const void*, A0)) { return Callback(obj, func); } @@ -2810,7 +2811,7 @@ Callback callback(const void *obj, R (*func)(const void*, A0)) { * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*, A0)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*, A0)) { return Callback(obj, func); } @@ -2821,7 +2822,7 @@ Callback callback(volatile void *obj, R (*func)(volatile void*, A0)) { * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*, A0)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*, A0)) { return Callback(obj, func); } @@ -2832,7 +2833,7 @@ Callback callback(const volatile void *obj, R (*func)(const volatile void * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*, A0)) { +Callback mbed_callback(T *obj, R (*func)(T*, A0)) { return Callback(obj, func); } @@ -2843,7 +2844,7 @@ Callback callback(T *obj, R (*func)(T*, A0)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*, A0)) { +Callback mbed_callback(const T *obj, R (*func)(const T*, A0)) { return Callback(obj, func); } @@ -2854,7 +2855,7 @@ Callback callback(const T *obj, R (*func)(const T*, A0)) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*, A0)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*, A0)) { return Callback(obj, func); } @@ -2865,7 +2866,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*, A0)) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*, A0)) { return Callback(obj, func); } @@ -2876,7 +2877,7 @@ Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0) * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)(A0)) { +Callback mbed_callback(T *obj, R (T::*func)(A0)) { return Callback(obj, func); } @@ -2887,7 +2888,7 @@ Callback callback(T *obj, R (T::*func)(A0)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)(A0) const) { +Callback mbed_callback(const T *obj, R (T::*func)(A0) const) { return Callback(obj, func); } @@ -2898,7 +2899,7 @@ Callback callback(const T *obj, R (T::*func)(A0) const) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)(A0) volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)(A0) volatile) { return Callback(obj, func); } @@ -2909,7 +2910,7 @@ Callback callback(volatile T *obj, R (T::*func)(A0) volatile) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)(A0) const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)(A0) const volatile) { return Callback(obj, func); } @@ -2920,7 +2921,7 @@ Callback callback(const volatile T *obj, R (T::*func)(A0) const volatile) * @return Callback with infered type */ template -Callback callback(R (*func)(A0, A1) = 0) { +Callback mbed_callback(R (*func)(A0, A1) = 0) { return Callback(func); } @@ -2930,7 +2931,7 @@ Callback callback(R (*func)(A0, A1) = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -2941,7 +2942,7 @@ Callback callback(const Callback &func) { * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*, A0, A1)) { +Callback mbed_callback(void *obj, R (*func)(void*, A0, A1)) { return Callback(obj, func); } @@ -2952,7 +2953,7 @@ Callback callback(void *obj, R (*func)(void*, A0, A1)) { * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*, A0, A1)) { +Callback mbed_callback(const void *obj, R (*func)(const void*, A0, A1)) { return Callback(obj, func); } @@ -2963,7 +2964,7 @@ Callback callback(const void *obj, R (*func)(const void*, A0, A1)) { * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*, A0, A1)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*, A0, A1)) { return Callback(obj, func); } @@ -2974,7 +2975,7 @@ Callback callback(volatile void *obj, R (*func)(volatile void*, A0, A * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1)) { return Callback(obj, func); } @@ -2985,7 +2986,7 @@ Callback callback(const volatile void *obj, R (*func)(const volatile * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*, A0, A1)) { +Callback mbed_callback(T *obj, R (*func)(T*, A0, A1)) { return Callback(obj, func); } @@ -2996,7 +2997,7 @@ Callback callback(T *obj, R (*func)(T*, A0, A1)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*, A0, A1)) { +Callback mbed_callback(const T *obj, R (*func)(const T*, A0, A1)) { return Callback(obj, func); } @@ -3007,7 +3008,7 @@ Callback callback(const T *obj, R (*func)(const T*, A0, A1)) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*, A0, A1)) { return Callback(obj, func); } @@ -3018,7 +3019,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1)) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1)) { return Callback(obj, func); } @@ -3029,7 +3030,7 @@ Callback callback(const volatile T *obj, R (*func)(const volatile T*, * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)(A0, A1)) { +Callback mbed_callback(T *obj, R (T::*func)(A0, A1)) { return Callback(obj, func); } @@ -3040,7 +3041,7 @@ Callback callback(T *obj, R (T::*func)(A0, A1)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)(A0, A1) const) { +Callback mbed_callback(const T *obj, R (T::*func)(A0, A1) const) { return Callback(obj, func); } @@ -3051,7 +3052,7 @@ Callback callback(const T *obj, R (T::*func)(A0, A1) const) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)(A0, A1) volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)(A0, A1) volatile) { return Callback(obj, func); } @@ -3062,7 +3063,7 @@ Callback callback(volatile T *obj, R (T::*func)(A0, A1) volatile) { * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)(A0, A1) const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)(A0, A1) const volatile) { return Callback(obj, func); } @@ -3073,7 +3074,7 @@ Callback callback(const volatile T *obj, R (T::*func)(A0, A1) const v * @return Callback with infered type */ template -Callback callback(R (*func)(A0, A1, A2) = 0) { +Callback mbed_callback(R (*func)(A0, A1, A2) = 0) { return Callback(func); } @@ -3083,7 +3084,7 @@ Callback callback(R (*func)(A0, A1, A2) = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -3094,7 +3095,7 @@ Callback callback(const Callback &func) { * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*, A0, A1, A2)) { +Callback mbed_callback(void *obj, R (*func)(void*, A0, A1, A2)) { return Callback(obj, func); } @@ -3105,7 +3106,7 @@ Callback callback(void *obj, R (*func)(void*, A0, A1, A2)) { * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*, A0, A1, A2)) { +Callback mbed_callback(const void *obj, R (*func)(const void*, A0, A1, A2)) { return Callback(obj, func); } @@ -3116,7 +3117,7 @@ Callback callback(const void *obj, R (*func)(const void*, A0, A1, * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2)) { return Callback(obj, func); } @@ -3127,7 +3128,7 @@ Callback callback(volatile void *obj, R (*func)(volatile void*, A * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2)) { return Callback(obj, func); } @@ -3138,7 +3139,7 @@ Callback callback(const volatile void *obj, R (*func)(const volat * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*, A0, A1, A2)) { +Callback mbed_callback(T *obj, R (*func)(T*, A0, A1, A2)) { return Callback(obj, func); } @@ -3149,7 +3150,7 @@ Callback callback(T *obj, R (*func)(T*, A0, A1, A2)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*, A0, A1, A2)) { +Callback mbed_callback(const T *obj, R (*func)(const T*, A0, A1, A2)) { return Callback(obj, func); } @@ -3160,7 +3161,7 @@ Callback callback(const T *obj, R (*func)(const T*, A0, A1, A2)) * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2)) { return Callback(obj, func); } @@ -3171,7 +3172,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1, * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2)) { return Callback(obj, func); } @@ -3182,7 +3183,7 @@ Callback callback(const volatile T *obj, R (*func)(const volatile * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)(A0, A1, A2)) { +Callback mbed_callback(T *obj, R (T::*func)(A0, A1, A2)) { return Callback(obj, func); } @@ -3193,7 +3194,7 @@ Callback callback(T *obj, R (T::*func)(A0, A1, A2)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)(A0, A1, A2) const) { +Callback mbed_callback(const T *obj, R (T::*func)(A0, A1, A2) const) { return Callback(obj, func); } @@ -3204,7 +3205,7 @@ Callback callback(const T *obj, R (T::*func)(A0, A1, A2) const) { * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)(A0, A1, A2) volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)(A0, A1, A2) volatile) { return Callback(obj, func); } @@ -3215,7 +3216,7 @@ Callback callback(volatile T *obj, R (T::*func)(A0, A1, A2) volat * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)(A0, A1, A2) const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)(A0, A1, A2) const volatile) { return Callback(obj, func); } @@ -3226,7 +3227,7 @@ Callback callback(const volatile T *obj, R (T::*func)(A0, A1, A2) * @return Callback with infered type */ template -Callback callback(R (*func)(A0, A1, A2, A3) = 0) { +Callback mbed_callback(R (*func)(A0, A1, A2, A3) = 0) { return Callback(func); } @@ -3236,7 +3237,7 @@ Callback callback(R (*func)(A0, A1, A2, A3) = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -3247,7 +3248,7 @@ Callback callback(const Callback &func) { * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*, A0, A1, A2, A3)) { +Callback mbed_callback(void *obj, R (*func)(void*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3258,7 +3259,7 @@ Callback callback(void *obj, R (*func)(void*, A0, A1, A2, A3) * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*, A0, A1, A2, A3)) { +Callback mbed_callback(const void *obj, R (*func)(const void*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3269,7 +3270,7 @@ Callback callback(const void *obj, R (*func)(const void*, A0, * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2, A3)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3280,7 +3281,7 @@ Callback callback(volatile void *obj, R (*func)(volatile void * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2, A3)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3291,7 +3292,7 @@ Callback callback(const volatile void *obj, R (*func)(const v * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*, A0, A1, A2, A3)) { +Callback mbed_callback(T *obj, R (*func)(T*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3302,7 +3303,7 @@ Callback callback(T *obj, R (*func)(T*, A0, A1, A2, A3)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*, A0, A1, A2, A3)) { +Callback mbed_callback(const T *obj, R (*func)(const T*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3313,7 +3314,7 @@ Callback callback(const T *obj, R (*func)(const T*, A0, A1, A * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2, A3)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3324,7 +3325,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*, A0, * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2, A3)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3335,7 +3336,7 @@ Callback callback(const volatile T *obj, R (*func)(const vola * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)(A0, A1, A2, A3)) { +Callback mbed_callback(T *obj, R (T::*func)(A0, A1, A2, A3)) { return Callback(obj, func); } @@ -3346,7 +3347,7 @@ Callback callback(T *obj, R (T::*func)(A0, A1, A2, A3)) { * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)(A0, A1, A2, A3) const) { +Callback mbed_callback(const T *obj, R (T::*func)(A0, A1, A2, A3) const) { return Callback(obj, func); } @@ -3357,7 +3358,7 @@ Callback callback(const T *obj, R (T::*func)(A0, A1, A2, A3) * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)(A0, A1, A2, A3) volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)(A0, A1, A2, A3) volatile) { return Callback(obj, func); } @@ -3368,7 +3369,7 @@ Callback callback(volatile T *obj, R (T::*func)(A0, A1, A2, A * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)(A0, A1, A2, A3) const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)(A0, A1, A2, A3) const volatile) { return Callback(obj, func); } @@ -3379,7 +3380,7 @@ Callback callback(const volatile T *obj, R (T::*func)(A0, A1, * @return Callback with infered type */ template -Callback callback(R (*func)(A0, A1, A2, A3, A4) = 0) { +Callback mbed_callback(R (*func)(A0, A1, A2, A3, A4) = 0) { return Callback(func); } @@ -3389,7 +3390,7 @@ Callback callback(R (*func)(A0, A1, A2, A3, A4) = 0) { * @return Callback with infered type */ template -Callback callback(const Callback &func) { +Callback mbed_callback(const Callback &func) { return Callback(func); } @@ -3400,7 +3401,7 @@ Callback callback(const Callback & * @return Callback with infered type */ template -Callback callback(void *obj, R (*func)(void*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(void *obj, R (*func)(void*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3411,7 +3412,7 @@ Callback callback(void *obj, R (*func)(void*, A0, A1, A2, * @return Callback with infered type */ template -Callback callback(const void *obj, R (*func)(const void*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(const void *obj, R (*func)(const void*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3422,7 +3423,7 @@ Callback callback(const void *obj, R (*func)(const void*, * @return Callback with infered type */ template -Callback callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(volatile void *obj, R (*func)(volatile void*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3433,7 +3434,7 @@ Callback callback(volatile void *obj, R (*func)(volatile * @return Callback with infered type */ template -Callback callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(const volatile void *obj, R (*func)(const volatile void*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3444,7 +3445,7 @@ Callback callback(const volatile void *obj, R (*func)(con * @return Callback with infered type */ template -Callback callback(T *obj, R (*func)(T*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(T *obj, R (*func)(T*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3455,7 +3456,7 @@ Callback callback(T *obj, R (*func)(T*, A0, A1, A2, A3, A * @return Callback with infered type */ template -Callback callback(const T *obj, R (*func)(const T*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(const T *obj, R (*func)(const T*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3466,7 +3467,7 @@ Callback callback(const T *obj, R (*func)(const T*, A0, A * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(volatile T *obj, R (*func)(volatile T*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3477,7 +3478,7 @@ Callback callback(volatile T *obj, R (*func)(volatile T*, * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2, A3, A4)) { +Callback mbed_callback(const volatile T *obj, R (*func)(const volatile T*, A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3488,7 +3489,7 @@ Callback callback(const volatile T *obj, R (*func)(const * @return Callback with infered type */ template -Callback callback(T *obj, R (T::*func)(A0, A1, A2, A3, A4)) { +Callback mbed_callback(T *obj, R (T::*func)(A0, A1, A2, A3, A4)) { return Callback(obj, func); } @@ -3499,7 +3500,7 @@ Callback callback(T *obj, R (T::*func)(A0, A1, A2, A3, A4 * @return Callback with infered type */ template -Callback callback(const T *obj, R (T::*func)(A0, A1, A2, A3, A4) const) { +Callback mbed_callback(const T *obj, R (T::*func)(A0, A1, A2, A3, A4) const) { return Callback(obj, func); } @@ -3510,7 +3511,7 @@ Callback callback(const T *obj, R (T::*func)(A0, A1, A2, * @return Callback with infered type */ template -Callback callback(volatile T *obj, R (T::*func)(A0, A1, A2, A3, A4) volatile) { +Callback mbed_callback(volatile T *obj, R (T::*func)(A0, A1, A2, A3, A4) volatile) { return Callback(obj, func); } @@ -3521,11 +3522,11 @@ Callback callback(volatile T *obj, R (T::*func)(A0, A1, A * @return Callback with infered type */ template -Callback callback(const volatile T *obj, R (T::*func)(A0, A1, A2, A3, A4) const volatile) { +Callback mbed_callback(const volatile T *obj, R (T::*func)(A0, A1, A2, A3, A4) const volatile) { return Callback(obj, func); } } // namespace mbed -#endif +#endif \ No newline at end of file diff --git a/hal/api/SerialBase.h b/hal/api/SerialBase.h index c76bf8d6847..e8efe7f92dd 100644 --- a/hal/api/SerialBase.h +++ b/hal/api/SerialBase.h @@ -106,14 +106,14 @@ class SerialBase { * @param type Which serial interrupt to attach the member function to (Seriall::RxIrq for receive, TxIrq for transmit buffer empty) * @deprecated * The attach function does not support cv-qualifiers. Replaced by - * attach(callback(obj, method), type). + * attach(mbed_callback(obj, method), type). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The attach function does not support cv-qualifiers. Replaced by " - "attach(callback(obj, method), type).") + "attach(mbed_callback(obj, method), type).") void attach(T *obj, void (T::*method)(), IrqType type=RxIrq) { - attach(callback(obj, method), type); + attach(mbed_callback(obj, method), type); } /** Attach a member function to call whenever a serial interrupt is generated @@ -123,14 +123,14 @@ class SerialBase { * @param type Which serial interrupt to attach the member function to (Seriall::RxIrq for receive, TxIrq for transmit buffer empty) * @deprecated * The attach function does not support cv-qualifiers. Replaced by - * attach(callback(obj, method), type). + * attach(mbed_callback(obj, method), type). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The attach function does not support cv-qualifiers. Replaced by " - "attach(callback(obj, method), type).") + "attach(mbed_callback(obj, method), type).") void attach(T *obj, void (*method)(T*), IrqType type=RxIrq) { - attach(callback(obj, method), type); + attach(mbed_callback(obj, method), type); } /** Generate a break condition on the serial line diff --git a/hal/api/Ticker.h b/hal/api/Ticker.h index 5b2f97ba950..838bdb2f139 100644 --- a/hal/api/Ticker.h +++ b/hal/api/Ticker.h @@ -83,14 +83,14 @@ class Ticker : public TimerEvent { * @param t the time between calls in seconds * @deprecated * The attach function does not support cv-qualifiers. Replaced by - * attach(callback(obj, method), t). + * attach(mbed_callback(obj, method), t). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The attach function does not support cv-qualifiers. Replaced by " - "attach(callback(obj, method), t).") + "attach(mbed_callback(obj, method), t).") void attach(T *obj, M method, float t) { - attach(callback(obj, method), t); + attach(mbed_callback(obj, method), t); } /** Attach a function to be called by the Ticker, specifiying the interval in micro-seconds @@ -110,12 +110,12 @@ class Ticker : public TimerEvent { * @param t the time between calls in micro-seconds * @deprecated * The attach_us function does not support cv-qualifiers. Replaced by - * attach_us(callback(obj, method), t). + * attach_us(mbed_callback(obj, method), t). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The attach_us function does not support cv-qualifiers. Replaced by " - "attach_us(callback(obj, method), t).") + "attach_us(mbed_callback(obj, method), t).") void attach_us(T *obj, M method, timestamp_t t) { attach_us(Callback(obj, method), t); } diff --git a/rtos/rtos/RtosTimer.h b/rtos/rtos/RtosTimer.h index 3f39a3999af..01fff47a900 100644 --- a/rtos/rtos/RtosTimer.h +++ b/rtos/rtos/RtosTimer.h @@ -47,7 +47,7 @@ class RtosTimer { MBED_DEPRECATED_SINCE("mbed-os-5.1", "Replaced with RtosTimer(Callback, os_timer_type)") RtosTimer(void (*func)(void const *argument), os_timer_type type=osTimerPeriodic, void *argument=NULL) { - constructor(mbed::callback(argument, (void (*)(void *))func), type); + constructor(mbed::mbed_callback(argument, (void (*)(void *))func), type); } /** Create timer. @@ -64,14 +64,14 @@ class RtosTimer { @param type osTimerOnce for one-shot or osTimerPeriodic for periodic behaviour. (default: osTimerPeriodic) @deprecated The RtosTimer constructor does not support cv-qualifiers. Replaced by - RtosTimer(callback(obj, method), os_timer_type). + RtosTimer(mbed::mbed_callback(obj, method), os_timer_type). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The RtosTimer constructor does not support cv-qualifiers. Replaced by " - "RtosTimer(callback(obj, method), os_timer_type).") + "RtosTimer(mbed_callback(obj, method), os_timer_type).") RtosTimer(T *obj, M method, os_timer_type type=osTimerPeriodic) { - constructor(mbed::callback(obj, method), type); + constructor(mbed::mbed_callback(obj, method), type); } /** Stop the timer. diff --git a/rtos/rtos/Thread.h b/rtos/rtos/Thread.h index 5c6114f355b..7f74e851bc0 100644 --- a/rtos/rtos/Thread.h +++ b/rtos/rtos/Thread.h @@ -108,12 +108,12 @@ class Thread { @param stack_size stack size (in bytes) requirements for the thread function. (default: DEFAULT_STACK_SIZE). @param stack_pointer pointer to the stack area to be used by this thread (default: NULL). @deprecated - Thread-spawning constructors hide errors. Replaced by thread.start(callback(argument, task)). + Thread-spawning constructors hide errors. Replaced by thread.start(mbed_callback(argument, task)). @code Thread thread(priority, stack_size, stack_pointer); - osStatus status = thread.start(callback(argument, task)); + osStatus status = thread.start(mbed_callback(argument, task)); if (status != osOK) { error("oh no!"); } @@ -122,12 +122,12 @@ class Thread { template MBED_DEPRECATED_SINCE("mbed-os-5.1", "Thread-spawning constructors hide errors. " - "Replaced by thread.start(callback(argument, task)).") + "Replaced by thread.start(mbed_callback(argument, task)).") Thread(T *argument, void (T::*task)(), osPriority priority=osPriorityNormal, uint32_t stack_size=DEFAULT_STACK_SIZE, unsigned char *stack_pointer=NULL) { - constructor(mbed::callback(argument, task), + constructor(mbed::mbed_callback(argument, task), priority, stack_size, stack_pointer); } @@ -139,12 +139,12 @@ class Thread { @param stack_size stack size (in bytes) requirements for the thread function. (default: DEFAULT_STACK_SIZE). @param stack_pointer pointer to the stack area to be used by this thread (default: NULL). @deprecated - Thread-spawning constructors hide errors. Replaced by thread.start(callback(argument, task)). + Thread-spawning constructors hide errors. Replaced by thread.start(mbed_callback(argument, task)). @code Thread thread(priority, stack_size, stack_pointer); - osStatus status = thread.start(callback(argument, task)); + osStatus status = thread.start(mbed_callback(argument, task)); if (status != osOK) { error("oh no!"); } @@ -153,12 +153,12 @@ class Thread { template MBED_DEPRECATED_SINCE("mbed-os-5.1", "Thread-spawning constructors hide errors. " - "Replaced by thread.start(callback(argument, task)).") + "Replaced by thread.start(mbed_callback(argument, task)).") Thread(T *argument, void (*task)(T *), osPriority priority=osPriorityNormal, uint32_t stack_size=DEFAULT_STACK_SIZE, unsigned char *stack_pointer=NULL) { - constructor(mbed::callback(argument, task), + constructor(mbed::mbed_callback(argument, task), priority, stack_size, stack_pointer); } @@ -170,12 +170,12 @@ class Thread { @param stack_size stack size (in bytes) requirements for the thread function. (default: DEFAULT_STACK_SIZE). @param stack_pointer pointer to the stack area to be used by this thread (default: NULL). @deprecated - Thread-spawning constructors hide errors. Replaced by thread.start(callback(argument, task)). + Thread-spawning constructors hide errors. Replaced by thread.start(mbed_callback(argument, task)). @code Thread thread(priority, stack_size, stack_pointer); - osStatus status = thread.start(callback(argument, task)); + osStatus status = thread.start(mbed_callback(argument, task)); if (status != osOK) { error("oh no!"); } @@ -183,12 +183,12 @@ class Thread { */ MBED_DEPRECATED_SINCE("mbed-os-5.1", "Thread-spawning constructors hide errors. " - "Replaced by thread.start(callback(argument, task)).") + "Replaced by thread.start(mbed_callback(argument, task)).") Thread(void (*task)(void const *argument), void *argument=NULL, osPriority priority=osPriorityNormal, uint32_t stack_size=DEFAULT_STACK_SIZE, unsigned char *stack_pointer=NULL) { - constructor(mbed::callback(argument, (void (*)(void *))task), + constructor(mbed::mbed_callback(argument, (void (*)(void *))task), priority, stack_size, stack_pointer); } @@ -203,14 +203,14 @@ class Thread { @param method function to be executed by this thread. @return status code that indicates the execution status of the function. @deprecated - The start function does not support cv-qualifiers. Replaced by start(callback(obj, method)). + The start function does not support cv-qualifiers. Replaced by start(mbed_callback(obj, method)). */ template MBED_DEPRECATED_SINCE("mbed-os-5.1", "The start function does not support cv-qualifiers. " - "Replaced by thread.start(callback(obj, method)).") + "Replaced by thread.start(mbed_callback(obj, method)).") osStatus start(T *obj, M method) { - return start(mbed::callback(obj, method)); + return start(mbed::mbed_callback(obj, method)); } /** Wait for thread to terminate