Skip to content

Commit b7bf209

Browse files
mi-mdziebowskinashif
authored andcommitted
zbus: fix error on ZBUS_CHAN_DEFINE
There appear error on `ZBUS_CHAN_DEFINE` when `CONFIG_CPP` is enabled. Error: `zephyr/zbus/zbus.h:352:9: error: designator order for field 'zbus_channel_data::highest_observer_priority' does not match declaration order in `zbus_channel_data`. Solution: change order in `ZBUS_CHAN_DEFINE` macro according to zbus_channel_data structure. Signed-off-by: Mariusz Dziębowski <[email protected]>
1 parent 348388b commit b7bf209

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/zephyr/zbus/zbus.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,13 @@ struct zbus_channel_observation {
342342
.observers_start_idx = -1, \
343343
.observers_end_idx = -1, \
344344
.sem = Z_SEM_INITIALIZER(_CONCAT(_zbus_chan_data_, _name).sem, 1, 1), \
345+
IF_ENABLED(CONFIG_ZBUS_PRIORITY_BOOST, ( \
346+
.highest_observer_priority = ZBUS_MIN_THREAD_PRIORITY, \
347+
)) \
345348
IF_ENABLED(CONFIG_ZBUS_RUNTIME_OBSERVERS, ( \
346349
.observers = SYS_SLIST_STATIC_INIT( \
347350
&_CONCAT(_zbus_chan_data_, _name).observers), \
348351
)) \
349-
IF_ENABLED(CONFIG_ZBUS_PRIORITY_BOOST, ( \
350-
.highest_observer_priority = ZBUS_MIN_THREAD_PRIORITY, \
351-
)) \
352352
}; \
353353
static K_MUTEX_DEFINE(_CONCAT(_zbus_mutex_, _name)); \
354354
_ZBUS_CPP_EXTERN const STRUCT_SECTION_ITERABLE(zbus_channel, _name) = { \

0 commit comments

Comments
 (0)