device: Update SYS_INIT_NAMED(), Z_DEVICE_INIT_ENTRY_DEFINE() to be C++ compatible #86957
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tristan-google
added
the
Hotfix
yperess
previously approved these changes
Mar 11, 2025
tristan-google
force-pushed
the
fast-fixes
branch
from
a511cc8 to
4d19012
Compare
tristan-google
changed the title
include/zephyr/init.h
Outdated
Comment on lines
167
to
168
| static const Z_DECL_ALIGN(struct init_entry) Z_INIT_ENTRY_SECTION(level, prio, 0) \ | ||
| __used __noasan \ |
There was a problem hiding this comment.
Does this need to reformat these two lines? Conventionally you'd avoid that.
gmarull
requested changes
Mar 12, 2025
In zephyrproject-rtos#84394, `struct init_entry` was modified to remove an unneeded union. The `SYS_INIT_NAMED()` macro was adjusted accordingly, but is no longer C++ compatible due to the partial designated initializer. Add an explicit value (NULL) for the other field (`dev`) in that struct. Signed-off-by: Tristan Honscheid <[email protected]>
The `Z_DEVICE_INIT_ENTRY_DEFINE()` macro uses a designated initializer to define a struct. Ensure all members of `struct init_entry` are defined in order for C++ compatibility. Signed-off-by: Tristan Honscheid <[email protected]>
tristan-google
force-pushed
the
fast-fixes
branch
from
4d19012 to
e3f290f
Compare
fabiobaltieri
approved these changes
Mar 12, 2025
tristan-google
changed the title
gmarull
approved these changes
Mar 12, 2025
yperess
approved these changes
Mar 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #84394,
struct init_entrywas modified to remove an unneeded union. TheSYS_INIT_NAMED()macro was adjusted accordingly, but is no longer C++ compatible due to the partial designated initializer.Add an explicit value (NULL) for the other field (
dev) in that struct.Additional change (second commit): the
Z_DEVICE_INIT_ENTRY_DEFINE()macro uses a designated initializer to define a struct. Ensure all members ofstruct init_entryare defined in order for C++ compatibility.