Skip to content

Commit 5fe6385

Browse files
Fix incorrect check for define
1 parent 8160b01 commit 5fe6385

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

connectivity/FEATURE_BLE/source/cordio/TESTS/cordio_hci/transport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
if("CORDIO_ZERO_COPY_HCI=1" IN_LIST MBED_CONFIG_DEFINITIONS)
4+
if("CORDIO_ZERO_COPY_HCI" IN_LIST MBED_CONFIG_DEFINITIONS)
55
set(TEST_SKIPPED "Test not relevant for zero copy hci.")
66
endif()
77

connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@ struct GattClient::DiscoveryControlBlock final : public ProcedureControlBlock {
488488
bool done;
489489
};
490490

491+
#undef TRACE_CLASS
491492
#define TRACE_CLASS "ReadControlBlock"
492493
struct GattClient::ReadControlBlock final : public ProcedureControlBlock {
493494
using ProcedureControlBlock::connection_handle;
@@ -701,6 +702,7 @@ struct GattClient::ReadControlBlock final : public ProcedureControlBlock {
701702
/*
702703
* Control block for the write process
703704
*/
705+
#undef TRACE_CLASS
704706
#define TRACE_CLASS "WriteControlBlock"
705707
struct GattClient::WriteControlBlock final : public ProcedureControlBlock {
706708
using ProcedureControlBlock::connection_handle;
@@ -926,6 +928,7 @@ struct GattClient::WriteControlBlock final : public ProcedureControlBlock {
926928
/*
927929
* Control block for the descriptor discovery process
928930
*/
931+
#undef TRACE_CLASS
929932
#define TRACE_CLASS "DescriptorDiscoveryControlBlock"
930933
struct GattClient::DescriptorDiscoveryControlBlock final : public ProcedureControlBlock {
931934
using ProcedureControlBlock::connection_handle;

rtos/tests/TESTS/mbed_rtos/mutex/main.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ volatile bool mutex_defect = false;
5858
bool manipulate_protected_zone(const Kernel::Clock::duration thread_delay)
5959
{
6060
bool result = true;
61-
osStatus stat;
6261

6362
stdio_mutex.lock();
6463

@@ -128,7 +127,6 @@ void test_multiple_threads(void)
128127

129128
void test_dual_thread_nolock_lock_thread(Mutex *mutex)
130129
{
131-
osStatus stat;
132130
mutex->lock();
133131

134132
mutex->unlock();
@@ -184,7 +182,6 @@ void test_dual_thread_lock_unlock_thread(Mutex *mutex)
184182
void test_dual_thread_lock_unlock(void)
185183
{
186184
Mutex mutex;
187-
osStatus stat;
188185
Thread thread(osPriorityNormal, TEST_STACK_SIZE);
189186

190187
mutex.lock();
@@ -230,7 +227,6 @@ template <void (*F)(Mutex *)>
230227
void test_dual_thread_lock(void)
231228
{
232229
Mutex mutex;
233-
osStatus stat;
234230
Thread thread(osPriorityNormal, TEST_STACK_SIZE);
235231

236232
mutex.lock();
@@ -251,7 +247,6 @@ void test_dual_thread_lock(void)
251247
void test_single_thread_lock_recursive(void)
252248
{
253249
Mutex mutex;
254-
osStatus stat;
255250

256251
mutex.lock();
257252

@@ -287,7 +282,6 @@ void test_single_thread_trylock(void)
287282
void test_single_thread_lock(void)
288283
{
289284
Mutex mutex;
290-
osStatus stat;
291285

292286
mutex.lock();
293287

0 commit comments

Comments
 (0)