gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/rosserial_server: backport upstream patch to build with boost 1.62, bug #594830

Browse Source 
Package-Manager: portage-2.3.2
This commit is contained in:
Alexis Ballier
2016-10-14 15:04:08 +02:00
parent 9fc0ac01cd
commit 78c02e67b9
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
dev-ros/rosserial_server/files/boost162.patch Normal file
View File

@@ -0,0 +1,61 @@
commit f8a46f3142444c854233a85f7a5ec7b91b5378a6
Author: Malte Splietker <splietker@users.noreply.github.com>
Date: Wed Oct 5 04:26:00 2016 +0200
Fixing build errors for boost >=1.60 (#226) (#250)
Signed-off-by: Malte Splietker <maltespl@mail.upb.de>
diff --git a/rosserial_server/include/rosserial_server/session.h b/rosserial_server/include/rosserial_server/session.h
index 86b9baa..ebd109a 100644
--- a/rosserial_server/include/rosserial_server/session.h
+++ b/rosserial_server/include/rosserial_server/session.h
@@ -499,7 +499,7 @@ private:
boost::asio::deadline_timer ros_spin_timer_;
std::string require_param_name_;
- std::map<uint16_t, boost::function<void(ros::serialization::IStream)> > callbacks_;
+ std::map<uint16_t, boost::function<void(ros::serialization::IStream&)> > callbacks_;
std::map<uint16_t, PublisherPtr> publishers_;
std::map<uint16_t, SubscriberPtr> subscribers_;
std::map<std::string, ServiceClientPtr> services_;
diff --git a/rosserial_server/include/rosserial_server/topic_handlers.h b/rosserial_server/include/rosserial_server/topic_handlers.h
index 666f3fc..2f367c3 100644
--- a/rosserial_server/include/rosserial_server/topic_handlers.h
+++ b/rosserial_server/include/rosserial_server/topic_handlers.h
@@ -93,7 +93,7 @@ typedef boost::shared_ptr<Publisher> PublisherPtr;
class Subscriber {
public:
Subscriber(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
- boost::function<void(std::vector<uint8_t> buffer)> write_fn)
+ boost::function<void(std::vector<uint8_t>& buffer)> write_fn)
: write_fn_(write_fn) {
ros::SubscribeOptions opts;
opts.init<topic_tools::ShapeShifter>(
@@ -119,7 +119,7 @@ private:
}
ros::Subscriber subscriber_;
- boost::function<void(std::vector<uint8_t> buffer)> write_fn_;
+ boost::function<void(std::vector<uint8_t>& buffer)> write_fn_;
};
typedef boost::shared_ptr<Subscriber> SubscriberPtr;
@@ -127,7 +127,7 @@ typedef boost::shared_ptr<Subscriber> SubscriberPtr;
class ServiceClient {
public:
ServiceClient(ros::NodeHandle& nh, rosserial_msgs::TopicInfo& topic_info,
- boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn)
+ boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn)
: write_fn_(write_fn) {
topic_id_ = -1;
if (!service_info_service_.isValid()) {
@@ -185,7 +185,7 @@ private:
topic_tools::ShapeShifter response_message_;
ros::ServiceClient service_client_;
static ros::ServiceClient service_info_service_;
- boost::function<void(std::vector<uint8_t> buffer, const uint16_t topic_id)> write_fn_;
+ boost::function<void(std::vector<uint8_t>& buffer, const uint16_t topic_id)> write_fn_;
std::string service_md5_;
std::string request_message_md5_;
std::string response_message_md5_;

1
dev-ros/rosserial_server/rosserial_server-0.7.4.ebuild
View File

@@ -21,3 +21,4 @@ RDEPEND="
dev-libs/boost:=[threads]
"
DEPEND="${RDEPEND}"
PATCHES=( "${FILESDIR}/boost162.patch" )