Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update style #445

Merged
merged 1 commit into from
Mar 1, 2018
Merged

update style #445

merged 1 commit into from
Mar 1, 2018

Conversation

dirk-thomas
Copy link
Member

@dirk-thomas dirk-thomas commented Feb 28, 2018

Connect to ament/uncrustify#20. Connect to ament/uncrustify#21.

Ready for review.

@dirk-thomas dirk-thomas added the in review Waiting for review (Kanban column) label Feb 28, 2018
@dirk-thomas dirk-thomas self-assigned this Feb 28, 2018
Copy link
Member

@wjwwood wjwwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some comments, but I'm good with the changes as-is, since they're an improvement.

typename std::allocator<void>::template rebind<T>::other>::value,
std::default_delete<T>,
AllocatorDeleter<Alloc>
>::type;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better. It's unfortunate that the last line >::type isn't indented one less (should end on the same column as the line that starts it).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A similar comment applies to all follow multi-line templates.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When targeting the latest release this "improvement" is sadly not possible. Therefore I revert this change.

@@ -116,7 +116,7 @@ throw_from_rcl_error(
rcl_ret_t ret,
const std::string & prefix = "",
const rcl_error_state_t * error_state = nullptr,
void (*reset_error)() = rcl_reset_error);
void (* reset_error)() = rcl_reset_error);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure this is better (more correct), but I'm fine with it too.


template<typename FunctorT, typename ... Args>
struct check_arguments : std::is_same<
typename function_traits<FunctorT>::arguments,
std::tuple<Args ...>
>
>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one has the right indentation for the closing >, but does 4 spaces rather than two on the inside... Which is somehow the counterpart of the one I commented on above. If only we could combine the two...

@wjwwood wjwwood mentioned this pull request Feb 28, 2018
@dirk-thomas dirk-thomas force-pushed the uncrustify_master branch 2 times, most recently from 04071cf to 0ce598b Compare February 28, 2018 20:09
@dirk-thomas dirk-thomas merged commit 1a604b0 into master Mar 1, 2018
@dirk-thomas dirk-thomas deleted the uncrustify_master branch March 1, 2018 16:58
@dirk-thomas dirk-thomas removed the in review Waiting for review (Kanban column) label Mar 1, 2018
nnmm pushed a commit to ApexAI/rclcpp that referenced this pull request Jul 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants