Skip to content

Commit 01cfa0f

Browse files
gekygeky
committed
Renamed callback -> mbed_callback
1 parent e9c556d commit 01cfa0f

File tree

9 files changed

+136
-135
lines changed

9 files changed

+136
-135
lines changed

‎TESTS/mbed_functional/callback/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ void test_dispatch0() {
328328
Verifier<T>::verify0((const Thing<T>*)&thing, &const_void_func0<T>);
329329
Verifier<T>::verify0((volatile Thing<T>*)&thing, &volatile_void_func0<T>);
330330
Verifier<T>::verify0((const volatile Thing<T>*)&thing, &const_volatile_void_func0<T>);
331-
Verifier<T>::verify0(callback(static_func0<T>));
331+
Verifier<T>::verify0(mbed_callback(static_func0<T>));
332332

333333
Callback<T()> cb(static_func0);
334334
Verifier<T>::verify0(cb);
@@ -355,7 +355,7 @@ void test_dispatch1() {
355355
Verifier<T>::verify1((const Thing<T>*)&thing, &const_void_func1<T>);
356356
Verifier<T>::verify1((volatile Thing<T>*)&thing, &volatile_void_func1<T>);
357357
Verifier<T>::verify1((const volatile Thing<T>*)&thing, &const_volatile_void_func1<T>);
358-
Verifier<T>::verify1(callback(static_func1<T>));
358+
Verifier<T>::verify1(mbed_callback(static_func1<T>));
359359

360360
Callback<T(T)> cb(static_func1);
361361
Verifier<T>::verify1(cb);
@@ -382,7 +382,7 @@ void test_dispatch2() {
382382
Verifier<T>::verify2((const Thing<T>*)&thing, &const_void_func2<T>);
383383
Verifier<T>::verify2((volatile Thing<T>*)&thing, &volatile_void_func2<T>);
384384
Verifier<T>::verify2((const volatile Thing<T>*)&thing, &const_volatile_void_func2<T>);
385-
Verifier<T>::verify2(callback(static_func2<T>));
385+
Verifier<T>::verify2(mbed_callback(static_func2<T>));
386386

387387
Callback<T(T, T)> cb(static_func2);
388388
Verifier<T>::verify2(cb);
@@ -409,7 +409,7 @@ void test_dispatch3() {
409409
Verifier<T>::verify3((const Thing<T>*)&thing, &const_void_func3<T>);
410410
Verifier<T>::verify3((volatile Thing<T>*)&thing, &volatile_void_func3<T>);
411411
Verifier<T>::verify3((const volatile Thing<T>*)&thing, &const_volatile_void_func3<T>);
412-
Verifier<T>::verify3(callback(static_func3<T>));
412+
Verifier<T>::verify3(mbed_callback(static_func3<T>));
413413

414414
Callback<T(T, T, T)> cb(static_func3);
415415
Verifier<T>::verify3(cb);
@@ -436,7 +436,7 @@ void test_dispatch4() {
436436
Verifier<T>::verify4((const Thing<T>*)&thing, &const_void_func4<T>);
437437
Verifier<T>::verify4((volatile Thing<T>*)&thing, &volatile_void_func4<T>);
438438
Verifier<T>::verify4((const volatile Thing<T>*)&thing, &const_volatile_void_func4<T>);
439-
Verifier<T>::verify4(callback(static_func4<T>));
439+
Verifier<T>::verify4(mbed_callback(static_func4<T>));
440440

441441
Callback<T(T, T, T, T)> cb(static_func4);
442442
Verifier<T>::verify4(cb);
@@ -463,7 +463,7 @@ void test_dispatch5() {
463463
Verifier<T>::verify5((const Thing<T>*)&thing, &const_void_func5<T>);
464464
Verifier<T>::verify5((volatile Thing<T>*)&thing, &volatile_void_func5<T>);
465465
Verifier<T>::verify5((const volatile Thing<T>*)&thing, &const_volatile_void_func5<T>);
466-
Verifier<T>::verify5(callback(static_func5<T>));
466+
Verifier<T>::verify5(mbed_callback(static_func5<T>));
467467

468468
Callback<T(T, T, T, T, T)> cb(static_func5);
469469
Verifier<T>::verify5(cb);

‎TESTS/mbed_functional/callback_big/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void test_dispatch0() {
202202
Verifier<T>::verify0((const Thing<T>*)&thing, &const_func0<T>);
203203
Verifier<T>::verify0((volatile Thing<T>*)&thing, &volatile_func0<T>);
204204
Verifier<T>::verify0((const volatile Thing<T>*)&thing, &const_volatile_func0<T>);
205-
Verifier<T>::verify0(callback(static_func0<T>));
205+
Verifier<T>::verify0(mbed_callback(static_func0<T>));
206206

207207
Callback<T()> cb(static_func0);
208208
Verifier<T>::verify0(cb);
@@ -225,7 +225,7 @@ void test_dispatch1() {
225225
Verifier<T>::verify1((const Thing<T>*)&thing, &const_func1<T>);
226226
Verifier<T>::verify1((volatile Thing<T>*)&thing, &volatile_func1<T>);
227227
Verifier<T>::verify1((const volatile Thing<T>*)&thing, &const_volatile_func1<T>);
228-
Verifier<T>::verify1(callback(static_func1<T>));
228+
Verifier<T>::verify1(mbed_callback(static_func1<T>));
229229

230230
Callback<T(T)> cb(static_func1);
231231
Verifier<T>::verify1(cb);
@@ -248,7 +248,7 @@ void test_dispatch2() {
248248
Verifier<T>::verify2((const Thing<T>*)&thing, &const_func2<T>);
249249
Verifier<T>::verify2((volatile Thing<T>*)&thing, &volatile_func2<T>);
250250
Verifier<T>::verify2((const volatile Thing<T>*)&thing, &const_volatile_func2<T>);
251-
Verifier<T>::verify2(callback(static_func2<T>));
251+
Verifier<T>::verify2(mbed_callback(static_func2<T>));
252252

253253
Callback<T(T, T)> cb(static_func2);
254254
Verifier<T>::verify2(cb);
@@ -271,7 +271,7 @@ void test_dispatch3() {
271271
Verifier<T>::verify3((const Thing<T>*)&thing, &const_func3<T>);
272272
Verifier<T>::verify3((volatile Thing<T>*)&thing, &volatile_func3<T>);
273273
Verifier<T>::verify3((const volatile Thing<T>*)&thing, &const_volatile_func3<T>);
274-
Verifier<T>::verify3(callback(static_func3<T>));
274+
Verifier<T>::verify3(mbed_callback(static_func3<T>));
275275

276276
Callback<T(T, T, T)> cb(static_func3);
277277
Verifier<T>::verify3(cb);
@@ -294,7 +294,7 @@ void test_dispatch4() {
294294
Verifier<T>::verify4((const Thing<T>*)&thing, &const_func4<T>);
295295
Verifier<T>::verify4((volatile Thing<T>*)&thing, &volatile_func4<T>);
296296
Verifier<T>::verify4((const volatile Thing<T>*)&thing, &const_volatile_func4<T>);
297-
Verifier<T>::verify4(callback(static_func4<T>));
297+
Verifier<T>::verify4(mbed_callback(static_func4<T>));
298298

299299
Callback<T(T, T, T, T)> cb(static_func4);
300300
Verifier<T>::verify4(cb);
@@ -317,7 +317,7 @@ void test_dispatch5() {
317317
Verifier<T>::verify5((const Thing<T>*)&thing, &const_func5<T>);
318318
Verifier<T>::verify5((volatile Thing<T>*)&thing, &volatile_func5<T>);
319319
Verifier<T>::verify5((const volatile Thing<T>*)&thing, &const_volatile_func5<T>);
320-
Verifier<T>::verify5(callback(static_func5<T>));
320+
Verifier<T>::verify5(mbed_callback(static_func5<T>));
321321

322322
Callback<T(T, T, T, T, T)> cb(static_func5);
323323
Verifier<T>::verify5(cb);

‎TESTS/mbed_functional/callback_small/main.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void test_dispatch0() {
202202
Verifier<T>::verify0((const Thing<T>*)&thing, &const_func0<T>);
203203
Verifier<T>::verify0((volatile Thing<T>*)&thing, &volatile_func0<T>);
204204
Verifier<T>::verify0((const volatile Thing<T>*)&thing, &const_volatile_func0<T>);
205-
Verifier<T>::verify0(callback(static_func0<T>));
205+
Verifier<T>::verify0(mbed_callback(static_func0<T>));
206206

207207
Callback<T()> cb(static_func0);
208208
Verifier<T>::verify0(cb);
@@ -225,7 +225,7 @@ void test_dispatch1() {
225225
Verifier<T>::verify1((const Thing<T>*)&thing, &const_func1<T>);
226226
Verifier<T>::verify1((volatile Thing<T>*)&thing, &volatile_func1<T>);
227227
Verifier<T>::verify1((const volatile Thing<T>*)&thing, &const_volatile_func1<T>);
228-
Verifier<T>::verify1(callback(static_func1<T>));
228+
Verifier<T>::verify1(mbed_callback(static_func1<T>));
229229

230230
Callback<T(T)> cb(static_func1);
231231
Verifier<T>::verify1(cb);
@@ -248,7 +248,7 @@ void test_dispatch2() {
248248
Verifier<T>::verify2((const Thing<T>*)&thing, &const_func2<T>);
249249
Verifier<T>::verify2((volatile Thing<T>*)&thing, &volatile_func2<T>);
250250
Verifier<T>::verify2((const volatile Thing<T>*)&thing, &const_volatile_func2<T>);
251-
Verifier<T>::verify2(callback(static_func2<T>));
251+
Verifier<T>::verify2(mbed_callback(static_func2<T>));
252252

253253
Callback<T(T, T)> cb(static_func2);
254254
Verifier<T>::verify2(cb);
@@ -271,7 +271,7 @@ void test_dispatch3() {
271271
Verifier<T>::verify3((const Thing<T>*)&thing, &const_func3<T>);
272272
Verifier<T>::verify3((volatile Thing<T>*)&thing, &volatile_func3<T>);
273273
Verifier<T>::verify3((const volatile Thing<T>*)&thing, &const_volatile_func3<T>);
274-
Verifier<T>::verify3(callback(static_func3<T>));
274+
Verifier<T>::verify3(mbed_callback(static_func3<T>));
275275

276276
Callback<T(T, T, T)> cb(static_func3);
277277
Verifier<T>::verify3(cb);
@@ -294,7 +294,7 @@ void test_dispatch4() {
294294
Verifier<T>::verify4((const Thing<T>*)&thing, &const_func4<T>);
295295
Verifier<T>::verify4((volatile Thing<T>*)&thing, &volatile_func4<T>);
296296
Verifier<T>::verify4((const volatile Thing<T>*)&thing, &const_volatile_func4<T>);
297-
Verifier<T>::verify4(callback(static_func4<T>));
297+
Verifier<T>::verify4(mbed_callback(static_func4<T>));
298298

299299
Callback<T(T, T, T, T)> cb(static_func4);
300300
Verifier<T>::verify4(cb);
@@ -317,7 +317,7 @@ void test_dispatch5() {
317317
Verifier<T>::verify5((const Thing<T>*)&thing, &const_func5<T>);
318318
Verifier<T>::verify5((volatile Thing<T>*)&thing, &volatile_func5<T>);
319319
Verifier<T>::verify5((const volatile Thing<T>*)&thing, &const_volatile_func5<T>);
320-
Verifier<T>::verify5(callback(static_func5<T>));
320+
Verifier<T>::verify5(mbed_callback(static_func5<T>));
321321

322322
Callback<T(T, T, T, T, T)> cb(static_func5);
323323
Verifier<T>::verify5(cb);

‎features/net/network-socket/Socket.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ class Socket {
177177
template <typename T, typename M>
178178
MBED_DEPRECATED_SINCE("mbed-os-5.1",
179179
"The attach function does not support cv-qualifiers. Replaced by "
180-
"attach(callback(obj, method)).")
180+
"attach(mbed_callback(obj, method)).")
181181
void attach(T *obj, M method) {
182-
attach(mbed::callback(obj, method));
182+
attach(mbed::mbed_callback(obj, method));
183183
}
184184

185185
protected:

0 commit comments

Comments
 (0)