Skip to content

Commit 6cd5680

Browse files
authored
Merge pull request #3 from orocos/fix-ros-transport-for-rt_string
rt_string_msgs: fixed registration of ROS transport for rt_string
2 parents 2e26ebc + e8238c7 commit 6cd5680

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

Diff for: include/orocos/rt_string_msgs/boost/rt_string.h

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
#ifndef RT_STRING_MSGS_BOOST_SERIALIZATION_RT_STRING_H
22
#define RT_STRING_MSGS_BOOST_SERIALIZATION_RT_STRING_H
33

4-
#include <boost/serialization/serialization.hpp>
5-
#include <boost/serialization/nvp.hpp>
6-
#include <boost/serialization/vector.hpp>
7-
#include <boost/serialization/string.hpp>
4+
// File needed because the generated typekits for derived message packages
5+
// unconditionally include rt_string_msgs/boost/rt_string.h
86

97
#include <rt_string_msgs/rt_string.h>
108

11-
// File needed because the generated typekit rtt_rt_string_msgs
12-
// unconditionally includes rt_string_msgs/boost/rt_string.h
13-
149
#endif // RT_STRING_MSGS_BOOST_SERIALIZATION_RT_STRING_H

Diff for: src/ros_rt_string_msgs_transport.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <rt_string_msgs/boost/rt_string.h>
1+
#include <rt_string_msgs/rt_string.h>
22

33
#include <rtt_roscomm/rtt_rostopic_ros_msg_transporter.hpp>
44
#include <rtt_roscomm/rtt_rostopic.h>
@@ -12,7 +12,7 @@ namespace rtt_roscomm {
1212
{
1313
bool registerTransport(std::string name, types::TypeInfo* ti)
1414
{
15-
if(name == "RTT.rt_string") { return ti->addProtocol(ORO_ROS_PROTOCOL_ID,new RosMsgTransporter<RTT::rt_string>());} else
15+
if(name == "rt_string") { return ti->addProtocol(ORO_ROS_PROTOCOL_ID, new RosMsgTransporter<RTT::rt_string>());} else
1616
return false;
1717
}
1818

0 commit comments

Comments
 (0)