Skip to content
Snippets Groups Projects
Commit cfbcc76a authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/py-dynamic-graph-bridge-v3] Update to v3.4.1

Changes in v3.4.1:
- [SotLoaderBasic] parseOptions does not call initialization anymore.
- Clean commands
parent bec443cb
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,7 @@
ORG= stack-of-tasks
NAME= dynamic-graph-bridge
VERSION= 3.4.0
PKGREVISION= 1
VERSION= 3.4.1
ROSNAME= $(subst -,_,${NAME})
DISTNAME= ${ROSNAME}-${VERSION}
......@@ -42,6 +41,7 @@ include ../../sysutils/ros-rospack/depend.mk
include ../../wip/dynamic-graph-v3/depend.mk
include ../../wip/py-dynamic-graph-v3/depend.mk
include ../../wip/sot-core-v3/depend.mk
include ../../wip/py-sot-core-v3/depend.mk
include ../../mk/sysdep/bullet.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/language/c.mk
......
SHA1 (dynamic_graph_bridge-3.4.0.tar.gz) = 61185109b90a4537be5c25ce2b6addf5781a8f2b
RMD160 (dynamic_graph_bridge-3.4.0.tar.gz) = c8e5cc39eafe2a45067db0e0930c47aea57a210b
Size (dynamic_graph_bridge-3.4.0.tar.gz) = 829045 bytes
SHA1 (patch-81) = d04bec3b063fa611b262d272c6306582477a06e2
SHA1 (dynamic_graph_bridge-3.4.1.tar.gz) = 8da403dbe30074873779b1e768ac3049e6c585bf
RMD160 (dynamic_graph_bridge-3.4.1.tar.gz) = 82ba65001fe446a5fba1682488f0f6cacf076a7d
Size (dynamic_graph_bridge-3.4.1.tar.gz) = 844361 bytes
From 5dcedba918b856c01a129408bfdce6c1a62a8111 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 26 Nov 2020 16:40:30 +0100
Subject: [PATCH] fix shadowing of Entity::name
To fix build with -Werror=shadow
---
src/ros_tf_listener.hh | 4 ++--
src/ros_time.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ros_tf_listener.hh b/src/ros_tf_listener.hh
index c046bee..a95907a 100644
--- src/ros_tf_listener.hh
+++ src/ros_tf_listener.hh
@@ -68,8 +68,8 @@ class RosTfListener : public Entity {
public:
typedef internal::TransformListenerData TransformListenerData;
- RosTfListener(const std::string& name)
- : Entity(name)
+ RosTfListener(const std::string& _name)
+ : Entity(_name)
, buffer()
, listener(buffer, rosInit(), false)
{
diff --git a/src/ros_time.cpp b/src/ros_time.cpp
index 52c8f76..7233ad3 100644
--- src/ros_time.cpp
+++ src/ros_time.cpp
@@ -22,8 +22,8 @@ const std::string RosTime::docstring_(
" Signal \"time\" provides time as given by ros::time as\n"
" boost::posix_time::ptime type.\n");
-RosTime::RosTime(const std::string& name)
- : Entity(name), now_("RosTime(" + name + ")::output(boost::posix_time::ptime)::time") {
+RosTime::RosTime(const std::string& _name)
+ : Entity(_name), now_("RosTime(" + _name + ")::output(boost::posix_time::ptime)::time") {
signalRegistration(now_);
now_.setConstant(rosTimeToPtime(ros::Time::now()));
now_.setFunction(boost::bind(&RosTime::update, this, _1, _2));
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment