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 #2479 from geky/deprecated-until 

Updated deprecation notices to match branch names
pull/2441/merge
Martin Kojtal 2016-08-18 09:06:39 +01:00 committed by GitHub
parent bdb4ab921f b12c27c5b4
commit 64a30a0095
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TESTS/mbedmicro-mbed/attributes/attributes.c
View File

@ -137,11 +137,11 @@ int testDeprecatedUsed() {
return 0; return 0;
} }
MBED_DEPRECATED_SINCE("v3.14", "this message should not be displayed") MBED_DEPRECATED_SINCE("mbed-os-3.14", "this message should not be displayed")
void testDeprecatedSinceUnused(); void testDeprecatedSinceUnused();
void testDeprecatedSinceUnused() { } void testDeprecatedSinceUnused() { }
MBED_DEPRECATED_SINCE("v3.14", "this message should be displayed") MBED_DEPRECATED_SINCE("mbed-os-3.14", "this message should be displayed")
int testDeprecatedSinceUsed(); int testDeprecatedSinceUsed();
int testDeprecatedSinceUsed() { int testDeprecatedSinceUsed() {
return 0; return 0;

8
hal/api/FunctionPointer.h
View File

@ -29,13 +29,13 @@ namespace mbed {
template <typename R, typename A1> template <typename R, typename A1>
class FunctionPointerArg1 : public Callback<R(A1)> { class FunctionPointerArg1 : public Callback<R(A1)> {
public: public:
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>") "FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>")
FunctionPointerArg1(R (*function)(A1) = 0) FunctionPointerArg1(R (*function)(A1) = 0)
: Callback<R(A1)>(function) {} : Callback<R(A1)>(function) {}
template<typename T> template<typename T>
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>") "FunctionPointerArg1<R, A> has been replaced by Callback<R(A)>")
FunctionPointerArg1(T *object, R (T::*member)(A1)) FunctionPointerArg1(T *object, R (T::*member)(A1))
: Callback<R(A1)>(object, member) {} : Callback<R(A1)>(object, member) {}
@ -48,13 +48,13 @@ public:
template <typename R> template <typename R>
class FunctionPointerArg1<R, void> : public Callback<R()> { class FunctionPointerArg1<R, void> : public Callback<R()> {
public: public:
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"FunctionPointer has been replaced by Callback<void()>") "FunctionPointer has been replaced by Callback<void()>")
FunctionPointerArg1(R (*function)() = 0) FunctionPointerArg1(R (*function)() = 0)
: Callback<R()>(function) {} : Callback<R()>(function) {}
template<typename T> template<typename T>
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"FunctionPointer has been replaced by Callback<void()>") "FunctionPointer has been replaced by Callback<void()>")
FunctionPointerArg1(T *object, R (T::*member)()) FunctionPointerArg1(T *object, R (T::*member)())
: Callback<R()>(object, member) {} : Callback<R()>(object, member) {}

2
hal/api/toolchain.h
View File

@ -234,7 +234,7 @@
* @code * @code
* #include "toolchain.h" * #include "toolchain.h"
* *
* MBED_DEPRECATED_SINCE("v5.1", "don't foo any more, bar instead") * MBED_DEPRECATED_SINCE("mbed-os-5.1", "don't foo any more, bar instead")
* void foo(int arg); * void foo(int arg);
* @endcode * @endcode
*/ */

2
rtos/rtos/RtosTimer.h
View File

@ -44,7 +44,7 @@ public:
@param argument argument to the timer call back function. (default: NULL) @param argument argument to the timer call back function. (default: NULL)
@deprecated Replaced with RtosTimer(Callback<void()>, os_timer_type) @deprecated Replaced with RtosTimer(Callback<void()>, os_timer_type)
*/ */
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"Replaced with RtosTimer(Callback<void()>, os_timer_type)") "Replaced with RtosTimer(Callback<void()>, os_timer_type)")
RtosTimer(void (*func)(void const *argument), os_timer_type type=osTimerPeriodic, void *argument=NULL) { RtosTimer(void (*func)(void const *argument), os_timer_type type=osTimerPeriodic, void *argument=NULL) {
constructor(mbed::Callback<void()>(argument, (void (*)(void *))func), type); constructor(mbed::Callback<void()>(argument, (void (*)(void *))func), type);

8
rtos/rtos/Thread.h
View File

@ -58,7 +58,7 @@ public:
The explicit Thread::start member function should be used to spawn The explicit Thread::start member function should be used to spawn
a thread. a thread.
*/ */
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"Thread-spawning constructors hide errors and may lead to complex " "Thread-spawning constructors hide errors and may lead to complex "
"program state when a thread is declared") "program state when a thread is declared")
Thread(mbed::Callback<void()> task, Thread(mbed::Callback<void()> task,
@ -83,7 +83,7 @@ public:
a thread. a thread.
*/ */
template <typename T> template <typename T>
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"Thread-spawning constructors hide errors and may lead to complex " "Thread-spawning constructors hide errors and may lead to complex "
"program state when a thread is declared") "program state when a thread is declared")
Thread(T *obj, void (T::*method)(), Thread(T *obj, void (T::*method)(),
@ -109,7 +109,7 @@ public:
a thread. a thread.
*/ */
template <typename T> template <typename T>
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"Thread-spawning constructors hide errors and may lead to complex " "Thread-spawning constructors hide errors and may lead to complex "
"program state when a thread is declared") "program state when a thread is declared")
Thread(T *obj, void (*method)(T *), Thread(T *obj, void (*method)(T *),
@ -134,7 +134,7 @@ public:
The explicit Thread::start member function should be used to spawn The explicit Thread::start member function should be used to spawn
a thread. a thread.
*/ */
MBED_DEPRECATED_SINCE("v5.1", MBED_DEPRECATED_SINCE("mbed-os-5.1",
"Thread-spawning constructors hide errors and may lead to complex " "Thread-spawning constructors hide errors and may lead to complex "
"program state when a thread is declared") "program state when a thread is declared")
Thread(void (*task)(void const *argument), void *argument=NULL, Thread(void (*task)(void const *argument), void *argument=NULL,