Skip to content

Commit 5e49bf7

Browse files
endurodaveendurodave
committed
Update DelegateMQ library
1 parent e164d7c commit 5e49bf7

File tree

102 files changed

+599
-503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+599
-503
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,12 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
3636
file(GLOB SOURCES "*.cpp" "*.h")
3737

3838
# Collect DelegateMQ predef source files
39-
list(APPEND SOURCES ${DMQ_PREDEF_SOURCES})
39+
list(APPEND SOURCES ${DMQ_PORT_SOURCES})
4040

4141
# Organize delegate source files within IDE (Visual Studio)
4242
source_group("Delegate Files" FILES ${DMQ_LIB_SOURCES})
43-
source_group("Predef Files" FILES ${DMQ_PREDEF_SOURCES})
43+
source_group("Port Files" FILES ${DMQ_PORT_ONLY_SOURCES})
44+
source_group("Extras Files" FILES ${DMQ_EXTRAS_SOURCES})
4445

4546
# Platform-specific linker flags
4647
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")

‎DelegateMQ/Common.cmake‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,12 @@
33
set(CMAKE_CXX_STANDARD 17)
44
set(CMAKE_CXX_STANDARD_REQUIRED True)
55

6+
# Global silence for MSVC deprecation warnings (Standard for latest compilers)
7+
if (MSVC)
8+
add_compile_options("/utf-8")
9+
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
10+
add_compile_definitions(_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS)
11+
endif()
12+
613

714

‎DelegateMQ/DelegateMQ.cmake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# DMQ_INCLUDE_DIR - the directory containing DelegateMQ headers.
66
# DMQ_LIB_SOURCES - the core DelegateMQ delegate library files.
7-
# DMQ_PREDEF_SOURCES - the predefined supporting source code files
7+
# DMQ_PORT_SOURCES - the predefined supporting source code files
88
# based on the DMQ build options.
99
#
1010
# Set DMQ build options:
@@ -15,8 +15,8 @@
1515
#
1616
# Use variables to build:
1717
#
18-
# # Collect DelegateMQ predef source files
19-
# list(APPEND SOURCES ${DMQ_PREDEF_SOURCES})
18+
# # Collect DelegateMQ port/extras source files
19+
# list(APPEND SOURCES ${DMQ_PORT_SOURCES})
2020
#
2121
# # Add include directory
2222
# include_directories(${DMQ_INCLUDE_DIR})
@@ -44,8 +44,8 @@ include ("${DMQ_ROOT_DIR}/Macros.cmake")
4444
check("${DMQ_ROOT_DIR}/Common.cmake")
4545
include ("${DMQ_ROOT_DIR}/Common.cmake")
4646

47-
check("${DMQ_ROOT_DIR}/Predef.cmake")
48-
include ("${DMQ_ROOT_DIR}/Predef.cmake")
47+
check("${DMQ_ROOT_DIR}/Port.cmake")
48+
include ("${DMQ_ROOT_DIR}/Port.cmake")
4949

5050
check("${DMQ_ROOT_DIR}/External.cmake")
5151
include ("${DMQ_ROOT_DIR}/External.cmake")

‎DelegateMQ/DelegateMQ.h‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,26 @@
120120
#endif
121121

122122
#if defined(DMQ_THREAD_STDLIB)
123-
#include "predef/os/stdlib/Thread.h"
124-
#include "predef/os/stdlib/ThreadMsg.h"
123+
#include "port/os/stdlib/Thread.h"
124+
#include "port/os/stdlib/ThreadMsg.h"
125125
#elif defined(DMQ_THREAD_WIN32)
126-
#include "predef/os/win32/Thread.h"
127-
#include "predef/os/win32/ThreadMsg.h"
126+
#include "port/os/win32/Thread.h"
127+
#include "port/os/win32/ThreadMsg.h"
128128
#elif defined(DMQ_THREAD_FREERTOS)
129-
#include "predef/os/freertos/Thread.h"
130-
#include "predef/os/freertos/ThreadMsg.h"
129+
#include "port/os/freertos/Thread.h"
130+
#include "port/os/freertos/ThreadMsg.h"
131131
#elif defined(DMQ_THREAD_THREADX)
132-
#include "predef/os/threadx/Thread.h"
133-
#include "predef/os/threadx/ThreadMsg.h"
132+
#include "port/os/threadx/Thread.h"
133+
#include "port/os/threadx/ThreadMsg.h"
134134
#elif defined(DMQ_THREAD_ZEPHYR)
135-
#include "predef/os/zephyr/Thread.h"
136-
#include "predef/os/zephyr/ThreadMsg.h"
135+
#include "port/os/zephyr/Thread.h"
136+
#include "port/os/zephyr/ThreadMsg.h"
137137
#elif defined(DMQ_THREAD_CMSIS_RTOS2)
138-
#include "predef/os/cmsis-rtos2/Thread.h"
139-
#include "predef/os/cmsis-rtos2/ThreadMsg.h"
138+
#include "port/os/cmsis-rtos2/Thread.h"
139+
#include "port/os/cmsis-rtos2/ThreadMsg.h"
140140
#elif defined(DMQ_THREAD_QT)
141-
#include "predef/os/qt/Thread.h"
142-
#include "predef/os/qt/ThreadMsg.h"
141+
#include "port/os/qt/Thread.h"
142+
#include "port/os/qt/ThreadMsg.h"
143143
#elif defined(DMQ_THREAD_NONE)
144144
// Bare metal: User must implement their own polling/interrupt logic
145145
#else
@@ -148,70 +148,70 @@
148148
#endif
149149

150150
#if defined(DMQ_SERIALIZE_MSGPACK)
151-
#include "predef/serialize/msgpack/Serializer.h"
151+
#include "port/serialize/msgpack/Serializer.h"
152152
#elif defined(DMQ_SERIALIZE_CEREAL)
153-
#include "predef/serialize/cereal/Serializer.h"
153+
#include "port/serialize/cereal/Serializer.h"
154154
#elif defined(DMQ_SERIALIZE_BITSERY)
155-
#include "predef/serialize/bitsery/Serializer.h"
155+
#include "port/serialize/bitsery/Serializer.h"
156156
#elif defined(DMQ_SERIALIZE_RAPIDJSON)
157-
#include "predef/serialize/rapidjson/Serializer.h"
157+
#include "port/serialize/rapidjson/Serializer.h"
158158
#elif defined(DMQ_SERIALIZE_SERIALIZE)
159-
#include "predef/serialize/serialize/Serializer.h"
159+
#include "port/serialize/serialize/Serializer.h"
160160
#elif defined(DMQ_SERIALIZE_NONE)
161161
// Create a custom application-specific serializer
162162
#else
163163
#warning "Serialize implementation not found."
164164
#endif
165165

166166
#if defined(DMQ_TRANSPORT_ZEROMQ)
167-
#include "predef/dispatcher/Dispatcher.h"
168-
#include "predef/transport/zeromq/ZeroMqTransport.h"
167+
#include "extras/dispatcher/Dispatcher.h"
168+
#include "port/transport/zeromq/ZeroMqTransport.h"
169169
#elif defined(DMQ_TRANSPORT_NNG)
170-
#include "predef/dispatcher/Dispatcher.h"
171-
#include "predef/transport/nng/NngTransport.h"
170+
#include "extras/dispatcher/Dispatcher.h"
171+
#include "port/transport/nng/NngTransport.h"
172172
#elif defined(DMQ_TRANSPORT_WIN32_PIPE)
173-
#include "predef/dispatcher/Dispatcher.h"
174-
#include "predef/transport/win32-pipe/Win32PipeTransport.h"
173+
#include "extras/dispatcher/Dispatcher.h"
174+
#include "port/transport/win32-pipe/Win32PipeTransport.h"
175175
#elif defined(DMQ_TRANSPORT_WIN32_UDP)
176-
#include "predef/dispatcher/Dispatcher.h"
177-
#include "predef/transport/win32-udp/Win32UdpTransport.h"
178-
#include "predef/transport/win32-udp/MulticastTransport.h"
176+
#include "extras/dispatcher/Dispatcher.h"
177+
#include "port/transport/win32-udp/Win32UdpTransport.h"
178+
#include "port/transport/win32-udp/MulticastTransport.h"
179179
#elif defined(DMQ_TRANSPORT_WIN32_TCP)
180-
#include "predef/dispatcher/Dispatcher.h"
181-
#include "predef/transport/win32-tcp/Win32TcpTransport.h"
180+
#include "extras/dispatcher/Dispatcher.h"
181+
#include "port/transport/win32-tcp/Win32TcpTransport.h"
182182
#elif defined(DMQ_TRANSPORT_LINUX_UDP)
183-
#include "predef/dispatcher/Dispatcher.h"
184-
#include "predef/transport/linux-udp/LinuxUdpTransport.h"
185-
#include "predef/transport/linux-udp/MulticastTransport.h"
183+
#include "extras/dispatcher/Dispatcher.h"
184+
#include "port/transport/linux-udp/LinuxUdpTransport.h"
185+
#include "port/transport/linux-udp/MulticastTransport.h"
186186
#elif defined(DMQ_TRANSPORT_LINUX_TCP)
187-
#include "predef/dispatcher/Dispatcher.h"
188-
#include "predef/transport/linux-tcp/LinuxTcpTransport.h"
187+
#include "extras/dispatcher/Dispatcher.h"
188+
#include "port/transport/linux-tcp/LinuxTcpTransport.h"
189189
#elif defined(DMQ_TRANSPORT_MQTT)
190-
#include "predef/dispatcher/Dispatcher.h"
191-
#include "predef/transport/mqtt/MqttTransport.h"
190+
#include "extras/dispatcher/Dispatcher.h"
191+
#include "port/transport/mqtt/MqttTransport.h"
192192
#elif defined(DMQ_TRANSPORT_SERIAL_PORT)
193-
#include "predef/dispatcher/Dispatcher.h"
194-
#include "predef/transport/serial/SerialTransport.h"
193+
#include "extras/dispatcher/Dispatcher.h"
194+
#include "port/transport/serial/SerialTransport.h"
195195
#elif defined(DMQ_TRANSPORT_ARM_LWIP_UDP)
196-
#include "predef/dispatcher/Dispatcher.h"
197-
#include "predef/transport/arm-lwip-udp/ArmLwipUdpTransport.h"
196+
#include "extras/dispatcher/Dispatcher.h"
197+
#include "port/transport/arm-lwip-udp/ArmLwipUdpTransport.h"
198198
#elif defined(DMQ_TRANSPORT_ARM_LWIP_NETCONN_UDP)
199-
#include "predef/dispatcher/Dispatcher.h"
200-
#include "predef/transport/arm-lwip-netconn-udp/ArmLwipNetconnUdpTransport.h"
199+
#include "extras/dispatcher/Dispatcher.h"
200+
#include "port/transport/arm-lwip-netconn-udp/ArmLwipNetconnUdpTransport.h"
201201
#elif defined(DMQ_TRANSPORT_THREADX_UDP)
202-
#include "predef/dispatcher/Dispatcher.h"
203-
#include "predef/transport/threadx-udp/NetXUdpTransport.h"
202+
#include "extras/dispatcher/Dispatcher.h"
203+
#include "port/transport/threadx-udp/NetXUdpTransport.h"
204204
#elif defined(DMQ_TRANSPORT_STM32_UART)
205-
#include "predef/dispatcher/Dispatcher.h"
206-
#include "predef/transport/stm32-uart/Stm32UartTransport.h"
205+
#include "extras/dispatcher/Dispatcher.h"
206+
#include "port/transport/stm32-uart/Stm32UartTransport.h"
207207
#elif defined(DMQ_TRANSPORT_ZEPHYR_UDP)
208-
#include "predef/dispatcher/Dispatcher.h"
209-
#include "predef/transport/zephyr-udp/ZephyrUdpTransport.h"
208+
#include "extras/dispatcher/Dispatcher.h"
209+
#include "port/transport/zephyr-udp/ZephyrUdpTransport.h"
210210
#elif defined(DMQ_TRANSPORT_NONE)
211211
// No built-in transport. Include the interface and dispatcher so application code
212212
// can implement a custom ITransport and use RemoteChannel with a mock or stub.
213-
#include "predef/dispatcher/Dispatcher.h"
214-
#include "predef/transport/ITransport.h"
213+
#include "extras/dispatcher/Dispatcher.h"
214+
#include "port/transport/ITransport.h"
215215
#else
216216
#warning "Transport implementation not found."
217217
#endif
@@ -228,28 +228,28 @@
228228
defined(DMQ_TRANSPORT_ARM_LWIP_NETCONN_UDP) || defined(DMQ_TRANSPORT_THREADX_UDP) || \
229229
defined(DMQ_TRANSPORT_STM32_UART) || defined(DMQ_TRANSPORT_ZEPHYR_UDP) || \
230230
defined(DMQ_TRANSPORT_NONE)
231-
#include "predef/dispatcher/RemoteChannel.h"
231+
#include "extras/dispatcher/RemoteChannel.h"
232232
#endif
233233

234-
#include "predef/util/Fault.h"
234+
#include "extras/util/Fault.h"
235235

236236
// Only include Timer and AsyncInvoke if threads exist
237237
#if !defined(DMQ_THREAD_NONE)
238-
#include "predef/util/Timer.h"
239-
#include "predef/util/AsyncInvoke.h"
240-
#include "predef/util/TransportMonitor.h"
238+
#include "extras/util/Timer.h"
239+
#include "extras/util/AsyncInvoke.h"
240+
#include "extras/util/TransportMonitor.h"
241241
#endif
242242

243243
// Only include NetworkEngine if a transport that uses it is active
244244
#if defined(DMQ_TRANSPORT_ZEROMQ) || defined(DMQ_TRANSPORT_WIN32_UDP) || \
245245
defined(DMQ_TRANSPORT_LINUX_UDP) || defined(DMQ_TRANSPORT_STM32_UART) || \
246246
defined(DMQ_TRANSPORT_SERIAL_PORT)
247-
#include "predef/util/NetworkEngine.h"
247+
#include "extras/util/NetworkEngine.h"
248248
#endif
249249

250250
#if defined(DMQ_DATABUS)
251-
#include "predef/databus/DataBus.h"
252-
#include "predef/databus/Participant.h"
251+
#include "extras/databus/DataBus.h"
252+
#include "extras/databus/Participant.h"
253253
#endif
254254

255255
#endif

‎DelegateMQ/External.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ if(DMQ_THREAD STREQUAL "DMQ_THREAD_QT")
261261

262262
# Collect the source files
263263
file(GLOB THREAD_SOURCES
264-
"${DMQ_ROOT_DIR}/predef/os/qt/*.cpp"
265-
"${DMQ_ROOT_DIR}/predef/os/qt/*.h"
264+
"${DMQ_ROOT_DIR}/port/os/qt/*.cpp"
265+
"${DMQ_ROOT_DIR}/port/os/qt/*.h"
266266
)
267267

268268
# Important: Enable CMAKE_AUTOMOC for the Qt Meta-Object system

0 commit comments

Comments
 (0)