Skip to content
This repository has been archived by the owner on Mar 2, 2023. It is now read-only.

mbed os@master+fixes+gcc 11 support #3

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,7 @@ class ReadOnlyGattCharacteristic : public GattCharacteristic {
* attribute value that equals sizeof(T). For a variable length alternative,
* use GattCharacteristic directly.
*/
ReadOnlyGattCharacteristic<T>(
ReadOnlyGattCharacteristic(
const UUID &uuid,
T *valuePtr,
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down Expand Up @@ -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<T>(
WriteOnlyGattCharacteristic(
const UUID &uuid,
T *valuePtr,
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down Expand Up @@ -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<T>(
ReadWriteGattCharacteristic(
const UUID &uuid,
T *valuePtr,
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down Expand Up @@ -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<T, NUM_ELEMENTS>(
WriteOnlyArrayGattCharacteristic(
const UUID &uuid,
T valuePtr[NUM_ELEMENTS],
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down Expand Up @@ -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<T, NUM_ELEMENTS>(
ReadOnlyArrayGattCharacteristic(
const UUID &uuid,
T valuePtr[NUM_ELEMENTS],
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down Expand Up @@ -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<T, NUM_ELEMENTS>(
ReadWriteArrayGattCharacteristic(
const UUID &uuid,
T valuePtr[NUM_ELEMENTS],
uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE,
Expand Down
16 changes: 10 additions & 6 deletions drivers/tests/UNITTESTS/doubles/drivers/LowPowerTicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#ifndef MBED_LOWPOWERTICKER_H
#define MBED_LOWPOWERTICKER_H

#include <chrono>

#include "hal/ticker_api.h"
#include "Callback.h"

Expand All @@ -28,21 +30,23 @@ namespace mbed {
class LowPowerTicker {

public:
LowPowerTicker()
{
}
LowPowerTicker() = default;

virtual ~LowPowerTicker() = default;

virtual ~LowPowerTicker()
void attach(Callback<void()> func, std::chrono::microseconds t)
{
func();
}

void attach_us(Callback<void()> func, us_timestamp_t t)
{

func();
}

void detach()
{

// nothing to do
}
};

Expand Down
3 changes: 0 additions & 3 deletions platform/cxxsupport/mstd_type_traits
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 <typename T>
Expand Down
2 changes: 1 addition & 1 deletion platform/include/platform/mbed_power_mgmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion platform/source/mbed_os_timer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
2 changes: 2 additions & 0 deletions platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <stdio.h>
#include <stdbool.h>

#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)
Expand Down
13 changes: 9 additions & 4 deletions rtos/tests/UNITTESTS/doubles/Mutex_stub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}