BLE: prevent warning from deprecated API implementation in GenericGap.

features/FEATURE_BLE/ble/pal/Deprecated.h

@@ -0,0 +1,48 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2018 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef BLE_PAL_DEPRECATED_H
+#define BLE_PAL_DEPRECATED_H
+
+/**
+ * Declare the beginning of a code block that uses a deprecated API
+ */
+#if defined(__GNUC__) && !defined(__CC_ARM)
+#define BLE_DEPRECATED_API_USE_BEGIN() \
+    _Pragma("GCC diagnostic push") \
+    _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif defined(__CC_ARM)
+#define BLE_DEPRECATED_API_USE_BEGIN() \
+    _Pragma("push") \
+    _Pragma("diag_suppress 1361")
+#else
+#define BLE_DEPRECATED_API_USE_BEGIN()
+#endif
+
+/**
+ * Declare the end of a code block that uses a deprecated API
+ */
+#if defined(__GNUC__) && !defined(__CC_ARM)
+#define BLE_DEPRECATED_API_USE_END() \
+    _Pragma("GCC diagnostic pop")
+#elif defined(__CC_ARM)
+#define BLE_DEPRECATED_API_USE_END() \
+        _Pragma("pop")
+#else
+#define BLE_DEPRECATED_API_USE_END()
+#endif
+
+
+#endif //BLE_PAL_DEPRECATED_H

features/FEATURE_BLE/source/generic/GenericGap.cpp

@@ -27,7 +27,9 @@
 #include "ble/generic/GenericGap.h"
 
 #include "drivers/Timeout.h"
-#include "Span.h"
+#include "platform/Span.h"
+
+#include "ble/pal/Deprecated.h"
 
 namespace ble {
 namespace generic {
@@ -1273,6 +1275,7 @@ void GenericGap::processConnectionEvent(
         );
     }
 
+BLE_DEPRECATED_API_USE_BEGIN()
     ::Gap::processConnectionEvent(
         handle,
         role,
@@ -1284,6 +1287,7 @@ void GenericGap::processConnectionEvent(
         peerResolvableAddr,
         localResolvableAddr
    );
+BLE_DEPRECATED_API_USE_END()
 }
 
 void GenericGap::processDisconnectionEvent(
@@ -1306,10 +1310,12 @@ void GenericGap::processDisconnectionEvent(
         );
     }
 
+BLE_DEPRECATED_API_USE_BEGIN()
     ::Gap::processDisconnectionEvent(
         handle,
         reason
     );
+BLE_DEPRECATED_API_USE_END()
 }
 
 void GenericGap::on_scan_timeout()
@@ -1327,7 +1333,9 @@ void GenericGap::process_scan_timeout()
     if (err) {
         // TODO: define the mechanism signaling the error
     }
+BLE_DEPRECATED_API_USE_BEGIN()
     processTimeoutEvent(::Gap::TIMEOUT_SRC_SCAN);
+BLE_DEPRECATED_API_USE_END()
 }
 
 void GenericGap::on_advertising_timeout()
@@ -1345,7 +1353,9 @@ void GenericGap::process_advertising_timeout()
     // Stop address rotation if required
     set_random_address_rotation(false);
 
+BLE_DEPRECATED_API_USE_BEGIN()
     processTimeoutEvent(::Gap::TIMEOUT_SRC_ADVERTISING);
+BLE_DEPRECATED_API_USE_END()
 }
 
 void GenericGap::on_gap_event_received(const pal::GapEvent& e)
@@ -1400,6 +1410,7 @@ void GenericGap::on_advertising_report(const pal::GapAdvertisingReportEvent& e)
         peer_address_type_t peer_address_type =
             static_cast<peer_address_type_t::type>(advertising.address_type.value());
 
+BLE_DEPRECATED_API_USE_BEGIN()
         processAdvertisementReport(
             advertising.address.data(),
             advertising.rssi,
@@ -1409,6 +1420,7 @@ void GenericGap::on_advertising_report(const pal::GapAdvertisingReportEvent& e)
             advertising.data.data(),
             peer_address_type
         );
+BLE_DEPRECATED_API_USE_END()
     }
 }
 
@@ -1419,7 +1431,9 @@ void GenericGap::on_connection_complete(const pal::GapConnectionCompleteEvent& e
         // event
 
         // TODO: Define events in case of connection faillure
+BLE_DEPRECATED_API_USE_BEGIN()
         processTimeoutEvent(::Gap::TIMEOUT_SRC_CONN);
+BLE_DEPRECATED_API_USE_END()
         return;
     }