Merge pull request #81 from nim65s/devel

fix shadowing of Entity::name

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)
   {

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));