From b12c27c5b46e572ee8423d1ead2dc14d28b8a1c3 Mon Sep 17 00:00:00 2001
From: Christopher Haster <chaster@utexas.edu>
Date: Tue, 16 Aug 2016 20:30:20 -0500
Subject: [PATCH] Updated deprecation notices to match branch names

Example:

    MBED_DEPRECATED_SINCE("mbed-os-5.1", "don't foo any more, bar instead")
    void foo(int arg);
---
 TESTS/mbedmicro-mbed/attributes/attributes.c | 4 ++--
 hal/api/FunctionPointer.h                    | 8 ++++----
 hal/api/toolchain.h                          | 2 +-
 rtos/rtos/RtosTimer.h                        | 2 +-
 rtos/rtos/Thread.h                           | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/TESTS/mbedmicro-mbed/attributes/attributes.c b/TESTS/mbedmicro-mbed/attributes/attributes.c
index 957441a1b9d..ae2e8589beb 100644
--- a/TESTS/mbedmicro-mbed/attributes/attributes.c
+++ b/TESTS/mbedmicro-mbed/attributes/attributes.c
@@ -137,11 +137,11 @@ int testDeprecatedUsed() {
     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() { }
 
-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() {
     return 0;
diff --git a/hal/api/FunctionPointer.h b/hal/api/FunctionPointer.h
index a5365b469f8..1626e3e483b 100644
--- a/hal/api/FunctionPointer.h
+++ b/hal/api/FunctionPointer.h
@@ -29,13 +29,13 @@ namespace mbed {
 template <typename R, typename A1>
 class FunctionPointerArg1 : public Callback<R(A1)> {
 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 (*function)(A1) = 0)
         : Callback<R(A1)>(function) {}
 
     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(T *object, R (T::*member)(A1))
         : Callback<R(A1)>(object, member) {}
@@ -48,13 +48,13 @@ class FunctionPointerArg1 : public Callback<R(A1)> {
 template <typename R>
 class FunctionPointerArg1<R, void> : public Callback<R()> {
 public:
-    MBED_DEPRECATED_SINCE("v5.1",
+    MBED_DEPRECATED_SINCE("mbed-os-5.1",
         "FunctionPointer has been replaced by Callback<void()>")
     FunctionPointerArg1(R (*function)() = 0)
         : Callback<R()>(function) {}
 
     template<typename T>
-    MBED_DEPRECATED_SINCE("v5.1",
+    MBED_DEPRECATED_SINCE("mbed-os-5.1",
         "FunctionPointer has been replaced by Callback<void()>")
     FunctionPointerArg1(T *object, R (T::*member)())
         : Callback<R()>(object, member) {}
diff --git a/hal/api/toolchain.h b/hal/api/toolchain.h
index 6373e8c6e4c..e7bff5fd706 100644
--- a/hal/api/toolchain.h
+++ b/hal/api/toolchain.h
@@ -234,7 +234,7 @@
  *  @code
  *  #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);
  *  @endcode
  */
diff --git a/rtos/rtos/RtosTimer.h b/rtos/rtos/RtosTimer.h
index 30177f9bba8..ab698ebd36b 100644
--- a/rtos/rtos/RtosTimer.h
+++ b/rtos/rtos/RtosTimer.h
@@ -44,7 +44,7 @@ class RtosTimer {
       @param   argument  argument to the timer call back function. (default: NULL)
       @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)")
     RtosTimer(void (*func)(void const *argument), os_timer_type type=osTimerPeriodic, void *argument=NULL) {
         constructor(mbed::Callback<void()>(argument, (void (*)(void *))func), type);
diff --git a/rtos/rtos/Thread.h b/rtos/rtos/Thread.h
index 3defa232d3e..eb1c39beab9 100644
--- a/rtos/rtos/Thread.h
+++ b/rtos/rtos/Thread.h
@@ -58,7 +58,7 @@ class Thread {
         The explicit Thread::start member function should be used to spawn
         a thread.
     */
-    MBED_DEPRECATED_SINCE("v5.1",
+    MBED_DEPRECATED_SINCE("mbed-os-5.1",
         "Thread-spawning constructors hide errors and may lead to complex "
         "program state when a thread is declared")
     Thread(mbed::Callback<void()> task,
@@ -83,7 +83,7 @@ class Thread {
         a thread.
     */
     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 "
         "program state when a thread is declared")
     Thread(T *obj, void (T::*method)(),
@@ -109,7 +109,7 @@ class Thread {
         a thread.
     */
     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 "
         "program state when a thread is declared")
     Thread(T *obj, void (*method)(T *),
@@ -134,7 +134,7 @@ class Thread {
         The explicit Thread::start member function should be used to spawn
         a thread.
     */
-    MBED_DEPRECATED_SINCE("v5.1",
+    MBED_DEPRECATED_SINCE("mbed-os-5.1",
         "Thread-spawning constructors hide errors and may lead to complex "
         "program state when a thread is declared")
     Thread(void (*task)(void const *argument), void *argument=NULL,