diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h index 3d63d2730ca..96e17dfbf22 100644 --- a/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h +++ b/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h @@ -1915,7 +1915,7 @@ class ReadOnlyGattCharacteristic : public GattCharacteristic { * attribute value that equals sizeof(T). For a variable length alternative, * use GattCharacteristic directly. */ - ReadOnlyGattCharacteristic( + ReadOnlyGattCharacteristic( const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, @@ -1958,7 +1958,7 @@ class WriteOnlyGattCharacteristic : public GattCharacteristic { * attribute value with maximum size equal to sizeof(T). For a fixed length * alternative, use GattCharacteristic directly. */ - WriteOnlyGattCharacteristic( + WriteOnlyGattCharacteristic( const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, @@ -2000,7 +2000,7 @@ class ReadWriteGattCharacteristic : public GattCharacteristic { * attribute value with maximum size equal to sizeof(T). For a fixed length * alternative, use GattCharacteristic directly. */ - ReadWriteGattCharacteristic( + ReadWriteGattCharacteristic( const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, @@ -2043,7 +2043,7 @@ class WriteOnlyArrayGattCharacteristic : public GattCharacteristic { * attribute value with maximum size equal to sizeof(T) * NUM_ELEMENTS. * For a fixed length alternative, use GattCharacteristic directly. */ - WriteOnlyArrayGattCharacteristic( + WriteOnlyArrayGattCharacteristic( const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, @@ -2087,7 +2087,7 @@ class ReadOnlyArrayGattCharacteristic : public GattCharacteristic { * attribute value that equals sizeof(T) * NUM_ELEMENTS. For a variable * length alternative, use GattCharacteristic directly. */ - ReadOnlyArrayGattCharacteristic( + ReadOnlyArrayGattCharacteristic( const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, @@ -2132,7 +2132,7 @@ class ReadWriteArrayGattCharacteristic : public GattCharacteristic { * attribute value with maximum size equal to sizeof(T) * NUM_ELEMENTS. * For a fixed length alternative, use GattCharacteristic directly. */ - ReadWriteArrayGattCharacteristic( + ReadWriteArrayGattCharacteristic( const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, diff --git a/drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h b/drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h index 1d0bb6b5da2..968d698e84e 100644 --- a/drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h +++ b/drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h @@ -17,6 +17,8 @@ #ifndef MBED_LOWPOWERTICKER_H #define MBED_LOWPOWERTICKER_H +#include + #include "hal/ticker_api.h" #include "Callback.h" @@ -28,21 +30,23 @@ namespace mbed { class LowPowerTicker { public: - LowPowerTicker() - { - } + LowPowerTicker() = default; + + virtual ~LowPowerTicker() = default; - virtual ~LowPowerTicker() + void attach(Callback func, std::chrono::microseconds t) { + func(); } void attach_us(Callback func, us_timestamp_t t) { - + func(); } + void detach() { - + // nothing to do } }; diff --git a/platform/cxxsupport/mstd_type_traits b/platform/cxxsupport/mstd_type_traits index 0513ba91f3e..240ffdf3f55 100644 --- a/platform/cxxsupport/mstd_type_traits +++ b/platform/cxxsupport/mstd_type_traits @@ -210,7 +210,6 @@ using std::is_trivial; using std::is_trivially_copyable; using std::is_standard_layout; using std::is_pod; -using std::is_literal_type; using std::is_empty; using std::is_polymorphic; using std::is_abstract; @@ -274,8 +273,6 @@ using std::decay; using std::decay_t; using std::common_type; using std::common_type_t; -using std::result_of; -using std::result_of_t; /* C++20 remove_cvref */ template diff --git a/platform/include/platform/mbed_power_mgmt.h b/platform/include/platform/mbed_power_mgmt.h index caf1d02d738..1fad877675a 100644 --- a/platform/include/platform/mbed_power_mgmt.h +++ b/platform/include/platform/mbed_power_mgmt.h @@ -192,7 +192,7 @@ void sleep_manager_sleep_auto(void); * Flash re-programming and the USB serial port will remain active, but the mbed program will no longer be * able to access the LocalFileSystem */ -static inline void sleep(void) +static inline void mbed_sleep(void) { #if DEVICE_SLEEP #if (MBED_CONF_RTOS_PRESENT == 0) || (DEVICE_SYSTICK_CLK_OFF_DURING_SLEEP == 0) || defined(MBED_TICKLESS) diff --git a/platform/source/mbed_os_timer.cpp b/platform/source/mbed_os_timer.cpp index d7b2f075b19..1ea0563c1c5 100644 --- a/platform/source/mbed_os_timer.cpp +++ b/platform/source/mbed_os_timer.cpp @@ -170,7 +170,7 @@ void do_sleep_operation(OpT &op) // we go round to set the timer again. if (op.sleep_prepared()) { // Enter HAL sleep (normal or deep) - sleep(); + mbed_sleep(); } } diff --git a/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp index 4b046d7f41c..bbe49e79248 100644 --- a/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp +++ b/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp @@ -20,6 +20,8 @@ #include #include +#pragma GCC diagnostic ignored "-Winvalid-noreturn" + bool mbed_assert_throw_errors = false; extern "C" void mbed_assert_internal(const char *expr, const char *file, int line) diff --git a/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp b/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp index d90ae20002f..963ad87b73d 100644 --- a/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp +++ b/rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp @@ -19,20 +19,25 @@ rtos::Mutex::Mutex() { - return; + return; } rtos::Mutex::~Mutex() { - return; + return; } osStatus rtos::Mutex::lock() { - return osOK; + return osOK; } osStatus rtos::Mutex::unlock() { - return osOK; + return osOK; +} + +bool rtos::Mutex::trylock() +{ + return true; }