From c274b672345ff54e027710cfd1b6944a4be1a288 Mon Sep 17 00:00:00 2001
From: Gabriele Buondonno <gbuondon@laas.fr>
Date: Mon, 25 Mar 2019 17:14:47 +0100
Subject: [PATCH] [nd-trajectory-generator] Remove warnings
---
.../talos_balance/nd-trajectory-generator.hh | 2 +-
src/nd-trajectory-generator.cpp | 26 ++++++++++---------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/include/sot/talos_balance/nd-trajectory-generator.hh b/include/sot/talos_balance/nd-trajectory-generator.hh
index 223bf67..e987bbf 100644
--- a/include/sot/talos_balance/nd-trajectory-generator.hh
+++ b/include/sot/talos_balance/nd-trajectory-generator.hh
@@ -63,7 +63,7 @@ namespace dynamicgraph {
/* --------------------------------------------------------------------- */
class SOTNDTRAJECTORYGENERATOR_EXPORT NdTrajectoryGenerator
- :public::dynamicgraph::Entity
+ :public::dynamicgraph::Entity
{
typedef NdTrajectoryGenerator EntityClassName;
DYNAMIC_GRAPH_ENTITY_DECL();
diff --git a/src/nd-trajectory-generator.cpp b/src/nd-trajectory-generator.cpp
index 3b84bff..1de1839 100644
--- a/src/nd-trajectory-generator.cpp
+++ b/src/nd-trajectory-generator.cpp
@@ -56,12 +56,12 @@ namespace dynamicgraph
,CONSTRUCT_SIGNAL(x, OUT, dynamicgraph::Vector)
,CONSTRUCT_SIGNAL_OUT(dx, dynamicgraph::Vector, m_xSOUT)
,CONSTRUCT_SIGNAL_OUT(ddx, dynamicgraph::Vector, m_xSOUT)
- ,m_firstIter(true)
- ,m_splineReady(false)
,m_initSucceeded(false)
- ,m_n(1)
+ ,m_firstIter(true)
,m_t(0)
+ ,m_n(1)
,m_iterLast(0)
+ ,m_splineReady(false)
{
BIND_SIGNAL_TO_FUNCTION(x, OUT, dynamicgraph::Vector);
@@ -151,7 +151,7 @@ namespace dynamicgraph
m_linChirpTrajGen.resize(m_n);
m_currentTrajGen.resize(m_n);
m_noTrajGen.resize(m_n);
- for(int i=0; i<m_n; i++)
+ for(unsigned i=0; i<m_n; i++)
{
m_minJerkTrajGen[i] = new parametriccurves::MinimumJerk<double,1>(5.0);
m_sinTrajGen[i] = new parametriccurves::InfiniteSinusoid<double,1>(5.0);
@@ -202,7 +202,7 @@ namespace dynamicgraph
m_currentTrajGen[i]->setInitialPoint(initial_value(i));
m_firstIter = false;
}
- else if(iter == m_iterLast)
+ else if(iter == static_cast<int>(m_iterLast))
{
if (m_triggerSIN(iter)==true && m_splineReady) startSpline();
if(m_status[0]==JTG_TEXT_FILE)
@@ -287,6 +287,7 @@ namespace dynamicgraph
}
const dynamicgraph::Vector& x = m_xSOUT(iter);
+ (void) x; // disable unused variable warning
if(s.size()!=m_n)
s.resize(m_n);
@@ -312,6 +313,7 @@ namespace dynamicgraph
}
const dynamicgraph::Vector& x = m_xSOUT(iter);
+ (void) x; // disable unused variable warning
if(s.size()!=m_n)
s.resize(m_n);
@@ -335,7 +337,7 @@ namespace dynamicgraph
void NdTrajectoryGenerator::getValue(const int& id)
{
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
SEND_MSG("Current value of component "+toString(id)+" is "+toString( (*m_currentTrajGen[id])(m_t)[0]) , MSG_TYPE_INFO);
@@ -453,7 +455,7 @@ namespace dynamicgraph
if(!m_initSucceeded)
return SEND_MSG("Cannot start sinusoid before initialization!",MSG_TYPE_ERROR);
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
unsigned int i = id;
if(time<=0.0)
@@ -476,7 +478,7 @@ namespace dynamicgraph
{
if(!m_initSucceeded)
return SEND_MSG("Cannot start triangle before initialization!",MSG_TYPE_ERROR);
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
unsigned int i = id;
if(m_status[i]!=JTG_STOP)
@@ -503,7 +505,7 @@ namespace dynamicgraph
{
if(!m_initSucceeded)
return SEND_MSG("Cannot start constant-acceleration trajectory before initialization!",MSG_TYPE_ERROR);
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
unsigned int i = id;
if(time<=0.0)
@@ -525,7 +527,7 @@ namespace dynamicgraph
{
if(!m_initSucceeded)
return SEND_MSG("Cannot start linear chirp before initialization!",MSG_TYPE_ERROR);
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
unsigned int i = id;
if(time<=0.0)
@@ -559,7 +561,7 @@ namespace dynamicgraph
if(!m_initSucceeded)
return SEND_MSG("Cannot move value before initialization!",MSG_TYPE_ERROR);
unsigned int i = id;
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
if(time<=0.0)
return SEND_MSG("Trajectory time must be a positive number", MSG_TYPE_ERROR);
@@ -594,7 +596,7 @@ namespace dynamicgraph
m_t = 0.0;
return;
}
- if(id<0 || id>=m_n)
+ if(id<0 || id>=static_cast<int>(m_n))
return SEND_MSG("Index is out of bounds", MSG_TYPE_ERROR);
unsigned int i = id;
m_noTrajGen[i]->setInitialPoint((*m_currentTrajGen[i])(m_t)[0]);
--
GitLab