From bbbda4e805c518998823e91b24902826fa1a062b Mon Sep 17 00:00:00 2001
From: Nirmal Giftsun <nirmal.giftsun@laas.fr>
Date: Mon, 4 Nov 2013 15:50:14 +0100
Subject: [PATCH] fixed this error:floating-point literal cannot appear in a
constant-expression
---
src/ros_joint_state.cpp | 1 +
src/ros_joint_state.hh | 2 +-
src/ros_publish.cpp | 2 ++
src/ros_publish.hh | 2 +-
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/ros_joint_state.cpp b/src/ros_joint_state.cpp
index 24b96e9..dccc85e 100644
--- a/src/ros_joint_state.cpp
+++ b/src/ros_joint_state.cpp
@@ -14,6 +14,7 @@
namespace dynamicgraph
{
DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(RosJointState, "RosJointState");
+ const double RosJointState::ROS_JOINT_STATE_PUBLISHER_RATE = 0.01;
namespace command
{
diff --git a/src/ros_joint_state.hh b/src/ros_joint_state.hh
index 6ce379c..cb21157 100644
--- a/src/ros_joint_state.hh
+++ b/src/ros_joint_state.hh
@@ -21,7 +21,7 @@ namespace dynamicgraph
/// \brief Vector input signal.
typedef SignalPtr<ml::Vector, int> signalVectorIn_t;
- static const double ROS_JOINT_STATE_PUBLISHER_RATE = 1. / 100.;
+ static const double ROS_JOINT_STATE_PUBLISHER_RATE;
RosJointState (const std::string& n);
virtual ~RosJointState ();
diff --git a/src/ros_publish.cpp b/src/ros_publish.cpp
index c7bc212..5ef5487 100644
--- a/src/ros_publish.cpp
+++ b/src/ros_publish.cpp
@@ -20,6 +20,8 @@
namespace dynamicgraph
{
DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(RosPublish, "RosPublish");
+
+ const double RosPublish::ROS_JOINT_STATE_PUBLISHER_RATE = 0.01;
namespace command
{
diff --git a/src/ros_publish.hh b/src/ros_publish.hh
index 03a5645..3a6d5d4 100644
--- a/src/ros_publish.hh
+++ b/src/ros_publish.hh
@@ -60,7 +60,7 @@ namespace dynamicgraph
callback_t>
bindedSignal_t;
- static const double ROS_JOINT_STATE_PUBLISHER_RATE = 1. / 100.;
+ static const double ROS_JOINT_STATE_PUBLISHER_RATE;
RosPublish (const std::string& n);
virtual ~RosPublish ();
--
GitLab