Closed gavanderhoorn closed 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.
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.
For now (ie: in
melodic
andmelodic-devel
), accept the old#define
sROS
andLINUXSOCKETS
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.