Add bw-compatibility to simple_message ifdefs

ros-industrial / industrial_core

ROS-Industrial core communication packages (http://wiki.ros.org/industrial_core)

153 stars 180 forks source link

Add bw-compatibility to simple_message ifdefs #275

Closed gavanderhoorn closed 3 years ago

gavanderhoorn commented 3 years ago

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.

gavanderhoorn commented 3 years ago

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 commented 3 years ago

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 https://github.com/ros-industrial/abb_driver/pull/12 and https://github.com/ros-industrial/fanuc/pull/324, so I'm fairly confident this will work.