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

Add bw-compatibility to simple_message ifdefs #275

Merged

Conversation

gavanderhoorn
Copy link
Member

For now (ie: in melodic and melodic-devel), accept the old #defines ROS and LINUXSOCKETS in addition to the newer ones (ie: the namespaced ones).

Should fix #274 and fix builds which haven't been updated to use the new simple_message_DEFINITIONS.

This was already suggested actually by @jdlangs in #190, but I removed it, hoping to get away with it in Melodic.

Unfortunately that didn't work, so here we are.

This adds some bw-compatibility to the changes merged in ros-industrial#262.

Remove these in noetic-devel.
@gavanderhoorn
Copy link
Member Author

If any of you could review?

I'll merge this with administrator access otherwise, but a second pair of eyes may be nice in this case.

@gavanderhoorn gavanderhoorn merged commit 9bc930c into ros-industrial:melodic-devel Jul 15, 2021
@gavanderhoorn gavanderhoorn deleted the add_bw_compat_262 branch July 15, 2021 15:17
@gavanderhoorn
Copy link
Member Author

As I'd like to get a release in the current sync, I'm merging this.

I've build-tested both fanuc_driver and abb_driver with this, without ros-industrial/abb_driver#12 and ros-industrial/fanuc#324, so I'm fairly confident this will work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Build issue breaking motoman/fanuc/internal drivers
1 participant