Skip to content

Commit bb8b3c2

Browse files
committed
[wip/py-dynamic-graph-bridge-v3] add patch-81
to fix build with -Werror=shadow
1 parent 12792dc commit bb8b3c2

File tree

3 files changed

+43
-0
lines changed

3 files changed

+43
-0
lines changed

py-dynamic-graph-bridge-v3/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
ORG= stack-of-tasks
55
NAME= dynamic-graph-bridge
66
VERSION= 3.4.0
7+
PKGREVISION= 1
78

89
ROSNAME= $(subst -,_,${NAME})
910
DISTNAME= ${ROSNAME}-${VERSION}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
SHA1 (dynamic_graph_bridge-3.4.0.tar.gz) = 61185109b90a4537be5c25ce2b6addf5781a8f2b
22
RMD160 (dynamic_graph_bridge-3.4.0.tar.gz) = c8e5cc39eafe2a45067db0e0930c47aea57a210b
33
Size (dynamic_graph_bridge-3.4.0.tar.gz) = 829045 bytes
4+
SHA1 (patch-81) = d04bec3b063fa611b262d272c6306582477a06e2
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
From 5dcedba918b856c01a129408bfdce6c1a62a8111 Mon Sep 17 00:00:00 2001
2+
From: Guilhem Saurel <guilhem.saurel@laas.fr>
3+
Date: Thu, 26 Nov 2020 16:40:30 +0100
4+
Subject: [PATCH] fix shadowing of Entity::name
5+
6+
To fix build with -Werror=shadow
7+
---
8+
src/ros_tf_listener.hh | 4 ++--
9+
src/ros_time.cpp | 4 ++--
10+
2 files changed, 4 insertions(+), 4 deletions(-)
11+
12+
diff --git a/src/ros_tf_listener.hh b/src/ros_tf_listener.hh
13+
index c046bee..a95907a 100644
14+
--- src/ros_tf_listener.hh
15+
+++ src/ros_tf_listener.hh
16+
@@ -68,8 +68,8 @@ class RosTfListener : public Entity {
17+
public:
18+
typedef internal::TransformListenerData TransformListenerData;
19+
20+
- RosTfListener(const std::string& name)
21+
- : Entity(name)
22+
+ RosTfListener(const std::string& _name)
23+
+ : Entity(_name)
24+
, buffer()
25+
, listener(buffer, rosInit(), false)
26+
{
27+
diff --git a/src/ros_time.cpp b/src/ros_time.cpp
28+
index 52c8f76..7233ad3 100644
29+
--- src/ros_time.cpp
30+
+++ src/ros_time.cpp
31+
@@ -22,8 +22,8 @@ const std::string RosTime::docstring_(
32+
" Signal \"time\" provides time as given by ros::time as\n"
33+
" boost::posix_time::ptime type.\n");
34+
35+
-RosTime::RosTime(const std::string& name)
36+
- : Entity(name), now_("RosTime(" + name + ")::output(boost::posix_time::ptime)::time") {
37+
+RosTime::RosTime(const std::string& _name)
38+
+ : Entity(_name), now_("RosTime(" + _name + ")::output(boost::posix_time::ptime)::time") {
39+
signalRegistration(now_);
40+
now_.setConstant(rosTimeToPtime(ros::Time::now()));
41+
now_.setFunction(boost::bind(&RosTime::update, this, _1, _2));

0 commit comments

Comments
 (0)