Skip to content

Commit b0a3327

Browse files
committed
Correctly include EventQueue.h
There are two EventQueue.h in mbed-os codebase: events/EventQueue.h features/FEATURE_BLE/ble/pal/EventQueue.h By accident, `mbed compile` generates includes.txt with the correct order of include search paths. This is not the case for the CMake exporter: targets with FEATURE_BLE enables fail to compile with errors: mbed-os/features/cellular/framework/AT/ATHandler.h:99:60: error: 'events' has not been declared Update all places to always include either "events/EventQueue.h" or "ble/pal/EventQueue.h": to always find the correct header.
1 parent baed84a commit b0a3327

File tree

20 files changed

+20
-21
lines changed

20 files changed

+20
-21
lines changed

TESTS/netsocket/dns/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "unity.h"
2727
#include "utest.h"
2828
#include "nsapi_dns.h"
29-
#include "EventQueue.h"
29+
#include "events/EventQueue.h"
3030
#include "dns_tests.h"
3131

3232
using namespace utest::v1;

UNITTESTS/features/cellular/framework/AT/at_cellularbase/at_cellularbasetest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "gtest/gtest.h"
1919
#include "AT_CellularBase.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "AT_CellularNetwork.h"
2222
#include "ATHandler_stub.h"
2323
#include "FileHandle_stub.h"

UNITTESTS/features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "gtest/gtest.h"
1818
#include <string.h>
1919
#include "AT_CellularContext.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "ATHandler.h"
2222
#include "AT_CellularDevice.h"
2323
#include "FileHandle_stub.h"

UNITTESTS/features/cellular/framework/AT/at_cellularinformation/at_cellularinformationtest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "gtest/gtest.h"
1818
#include <string.h>
1919
#include "ATHandler_stub.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "FileHandle_stub.h"
2222
#include "AT_CellularBase_stub.h"
2323
#include "ATHandler.h"

UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "gtest/gtest.h"
1818
#include <string.h>
1919
#include "AT_CellularNetwork.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "ATHandler.h"
2222
#include "AT_CellularDevice.h"
2323
#include "FileHandle_stub.h"

UNITTESTS/features/cellular/framework/AT/at_cellularsms/at_cellularsmstest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "gtest/gtest.h"
1818
#include <string.h>
1919
#include "AT_CellularNetwork.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "ATHandler.h"
2222
#include "ATHandler_stub.h"
2323
#include "AT_CellularSMS.h"

UNITTESTS/features/cellular/framework/AT/at_cellularstack/at_cellularstacktest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "AT_CellularStack.h"
1919
#include <string.h>
2020
#include "AT_CellularNetwork.h"
21-
#include "EventQueue.h"
21+
#include "events/EventQueue.h"
2222
#include "ATHandler.h"
2323
#include "AT_CellularStack.h"
2424
#include "FileHandle_stub.h"

UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "gtest/gtest.h"
1818
#include <string.h>
1919
#include "AT_CellularNetwork.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "ATHandler.h"
2222
#include "AT_CellularStack.h"
2323
#include "FileHandle_stub.h"

UNITTESTS/features/lorawan/lorawanstack/Test_LoRaWANStack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "gtest/gtest.h"
1919
#include "LoRaWANStack.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121

2222
#include "LoRaPHY_stub.h"
2323
#include "LoRaMac_stub.h"

UNITTESTS/stubs/ATHandler_stub.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <ctype.h>
1919
#include "nsapi_types.h"
2020
#include "ATHandler.h"
21-
#include "EventQueue.h"
21+
#include "events/EventQueue.h"
2222
#include "ATHandler_stub.h"
2323

2424
using namespace mbed;

UNITTESTS/stubs/CellularDevice_stub.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "CellularDevice.h"
1919
#include "CellularDevice_stub.h"
20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "CellularUtil.h"
2222

2323
using namespace mbed;

UNITTESTS/stubs/EventQueue_stub.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include "EventQueue.h"
18+
#include "events/EventQueue.h"
1919
#include "Callback.h"
2020
#include "EventQueue_stub.h"
2121

UNITTESTS/target_h/events/mbed_events.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef MBED_EVENTS_H
1919
#define MBED_EVENTS_H
2020

21-
#include "EventQueue.h"
21+
#include "events/EventQueue.h"
2222

2323
#include "events/mbed_shared_queues.h"
2424

features/FEATURE_BLE/targets/TARGET_CORDIO/SimpleEventQueue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define BLE_PAL_SIMPLE_EVENT_QUEUE_H_
1919

2020
#include <new>
21-
#include "EventQueue.h"
21+
#include "ble/pal/EventQueue.h"
2222
#include "ble/BLEInstanceBase.h"
2323
#include "ble/BLE.h"
2424

features/cellular/framework/AT/ATHandler.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@
2020

2121
#include "platform/mbed_retarget.h"
2222

23-
#include "EventQueue.h"
23+
#include "events/EventQueue.h"
2424
#include "PlatformMutex.h"
2525
#include "nsapi_types.h"
2626

2727
#include "PlatformMutex.h"
2828
#include "Callback.h"
29-
#include "EventQueue.h"
3029

3130
namespace mbed {
3231

features/cellular/framework/device/CellularDevice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "CellularUtil.h"
2121
#include "CellularLog.h"
2222
#include "CellularTargets.h"
23-
#include "EventQueue.h"
23+
#include "events/EventQueue.h"
2424

2525
namespace mbed {
2626

features/cellular/framework/device/CellularStateMachine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef _CELLULAR_STATEMACHINE_H_
1818
#define _CELLULAR_STATEMACHINE_H_
1919

20-
#include "EventQueue.h"
20+
#include "events/EventQueue.h"
2121
#include "CellularNetwork.h"
2222
#include "CellularCommon.h"
2323
#include "PlatformMutex.h"

features/nanostack/nanostack-hal-mbed-cmsis-rtos/arm_hal_fhss_timer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "platform/arm_hal_interrupt.h"
2323
#include <Timer.h>
2424
#include "equeue.h"
25-
#include "EventQueue.h"
25+
#include "events/EventQueue.h"
2626
#include "mbed_shared_queues.h"
2727
#include "Timeout.h"
2828

features/netsocket/NetworkStack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "nsapi_dns.h"
1919
#include "stddef.h"
2020
#include <new>
21-
#include "EventQueue.h"
21+
#include "events/EventQueue.h"
2222
#include "mbed_shared_queues.h"
2323

2424
// Default NetworkStack operations

features/netsocket/nsapi_dns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <stdlib.h>
2525
#include <stdio.h>
2626
#include "mbed_shared_queues.h"
27-
#include "EventQueue.h"
27+
#include "events/EventQueue.h"
2828
#include "OnboardNetworkStack.h"
2929
#include "Kernel.h"
3030
#include "PlatformMutex.h"

0 commit comments

Comments
 (0)