Remove a bunch of unnecessary macros. #482
Merged
Conversation
This file contains 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
The main goal here is to sidestep differences between uncrustify 0.72 and 0.78. However, I realized that a lot of these macros were either duplicating functionality we already had, or were just as long as "inlining" the code would be. Just get rid of these macros. In the one place that we can't do this, just mark the macro as not to be indented by uncrustify. Signed-off-by: Chris Lalancette <clalancette@gmail.com>
clalancette
commented
Feb 28, 2024
Comment on lines
+4361
to
+4405
| // Attach subscriptions | ||
| ws->subs.resize(0); | ||
| if (subs) { | ||
| ws->subs.reserve(subs->subscriber_count); | ||
| for (size_t i = 0; i < subs->subscriber_count; i++) { | ||
| auto x = static_cast<CddsSubscription *>(subs->subscribers[i]); | ||
| ws->subs.push_back(x); | ||
| dds_waitset_attach(ws->waitseth, x->rdcondh, nelems++); | ||
| } | ||
| } | ||
|
|
||
| // Attach guard conditions | ||
| ws->gcs.resize(0); | ||
| if (gcs) { | ||
| ws->gcs.reserve(gcs->guard_condition_count); | ||
| for (size_t i = 0; i < gcs->guard_condition_count; i++) { | ||
| auto x = static_cast<CddsGuardCondition *>(gcs->guard_conditions[i]); | ||
| ws->gcs.push_back(x); | ||
| dds_waitset_attach(ws->waitseth, x->gcondh, nelems++); | ||
| } | ||
| } | ||
|
|
||
| // Attach service servers | ||
| ws->srvs.resize(0); | ||
| if (srvs) { | ||
| ws->srvs.reserve(srvs->service_count); | ||
| for (size_t i = 0; i < srvs->service_count; i++) { | ||
| auto x = static_cast<CddsService *>(srvs->services[i]); | ||
| ws->srvs.push_back(x); | ||
| dds_waitset_attach(ws->waitseth, x->service.sub->rdcondh, nelems++); | ||
| } | ||
| } | ||
|
|
||
| // Attach service clients | ||
| ws->cls.resize(0); | ||
| if (cls) { | ||
| ws->cls.reserve(cls->client_count); | ||
| for (size_t i = 0; i < cls->client_count; i++) { | ||
| auto x = static_cast<CddsClient *>(cls->clients[i]); | ||
| ws->cls.push_back(x); | ||
| dds_waitset_attach(ws->waitseth, x->client.sub->rdcondh, nelems++); | ||
| } | ||
| } | ||
|
|
||
| // Attach events |
There was a problem hiding this comment.
Note to reviewers: this piece of code (and the DETACH below) are the places most likely to have some kind of problem during expansion. So please do a careful review of this section.
|
CI:
|
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.
The main goal here is to sidestep differences between uncrustify 0.72 and 0.78. However, I realized that a lot of these macros were either duplicating functionality we already had, or were just as long as "inlining" the code would be. Just get rid of these macros.
In the one place that we can't do this, just mark the macro as not to be indented by uncrustify.