Skip to content

Commit 64a30a0

Browse files
authored
Merge pull request #2479 from geky/deprecated-until
Updated deprecation notices to match branch names
2 parents bdb4ab9 + b12c27c commit 64a30a0

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

TESTS/mbedmicro-mbed/attributes/attributes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ int testDeprecatedUsed() {
137137
return 0;
138138
}
139139

140-
MBED_DEPRECATED_SINCE("v3.14", "this message should not be displayed")
140+
MBED_DEPRECATED_SINCE("mbed-os-3.14", "this message should not be displayed")
141141
void testDeprecatedSinceUnused();
142142
void testDeprecatedSinceUnused() { }
143143

144-
MBED_DEPRECATED_SINCE("v3.14", "this message should be displayed")
144+
MBED_DEPRECATED_SINCE("mbed-os-3.14", "this message should be displayed")
145145
int testDeprecatedSinceUsed();
146146
int testDeprecatedSinceUsed() {
147147
return 0;

hal/api/FunctionPointer.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ namespace mbed {
2929
template <typename R, typename A1>
3030
class FunctionPointerArg1 : public Callback<R(A1)> {
3131
public:
32-
MBED_DEPRECATED_SINCE("v5.1",
32+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
3333
"FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>")
3434
FunctionPointerArg1(R (*function)(A1) = 0)
3535
: Callback<R(A1)>(function) {}
3636

3737
template<typename T>
38-
MBED_DEPRECATED_SINCE("v5.1",
38+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
3939
"FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>")
4040
FunctionPointerArg1(T *object, R (T::*member)(A1))
4141
: Callback<R(A1)>(object, member) {}
@@ -48,13 +48,13 @@ class FunctionPointerArg1 : public Callback<R(A1)> {
4848
template <typename R>
4949
class FunctionPointerArg1<R, void> : public Callback<R()> {
5050
public:
51-
MBED_DEPRECATED_SINCE("v5.1",
51+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
5252
"FunctionPointer has been replaced by Callback<void()>")
5353
FunctionPointerArg1(R (*function)() = 0)
5454
: Callback<R()>(function) {}
5555

5656
template<typename T>
57-
MBED_DEPRECATED_SINCE("v5.1",
57+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
5858
"FunctionPointer has been replaced by Callback<void()>")
5959
FunctionPointerArg1(T *object, R (T::*member)())
6060
: Callback<R()>(object, member) {}

hal/api/toolchain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
* @code
235235
* #include "toolchain.h"
236236
*
237-
* MBED_DEPRECATED_SINCE("v5.1", "don't foo any more, bar instead")
237+
* MBED_DEPRECATED_SINCE("mbed-os-5.1", "don't foo any more, bar instead")
238238
* void foo(int arg);
239239
* @endcode
240240
*/

rtos/rtos/RtosTimer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class RtosTimer {
4444
@param argument argument to the timer call back function. (default: NULL)
4545
@deprecated Replaced with RtosTimer(Callback<void()>, os_timer_type)
4646
*/
47-
MBED_DEPRECATED_SINCE("v5.1",
47+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
4848
"Replaced with RtosTimer(Callback<void()>, os_timer_type)")
4949
RtosTimer(void (*func)(void const *argument), os_timer_type type=osTimerPeriodic, void *argument=NULL) {
5050
constructor(mbed::Callback<void()>(argument, (void (*)(void *))func), type);

rtos/rtos/Thread.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Thread {
5858
The explicit Thread::start member function should be used to spawn
5959
a thread.
6060
*/
61-
MBED_DEPRECATED_SINCE("v5.1",
61+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
6262
"Thread-spawning constructors hide errors and may lead to complex "
6363
"program state when a thread is declared")
6464
Thread(mbed::Callback<void()> task,
@@ -83,7 +83,7 @@ class Thread {
8383
a thread.
8484
*/
8585
template <typename T>
86-
MBED_DEPRECATED_SINCE("v5.1",
86+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
8787
"Thread-spawning constructors hide errors and may lead to complex "
8888
"program state when a thread is declared")
8989
Thread(T *obj, void (T::*method)(),
@@ -109,7 +109,7 @@ class Thread {
109109
a thread.
110110
*/
111111
template <typename T>
112-
MBED_DEPRECATED_SINCE("v5.1",
112+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
113113
"Thread-spawning constructors hide errors and may lead to complex "
114114
"program state when a thread is declared")
115115
Thread(T *obj, void (*method)(T *),
@@ -134,7 +134,7 @@ class Thread {
134134
The explicit Thread::start member function should be used to spawn
135135
a thread.
136136
*/
137-
MBED_DEPRECATED_SINCE("v5.1",
137+
MBED_DEPRECATED_SINCE("mbed-os-5.1",
138138
"Thread-spawning constructors hide errors and may lead to complex "
139139
"program state when a thread is declared")
140140
Thread(void (*task)(void const *argument), void *argument=NULL,

0 commit comments

Comments
 (0)