From 82a37d2d24f88f7f5857c81873376c6f7f82ee7f Mon Sep 17 00:00:00 2001
From: Olivier Stasse <olivier.stasse@gmail.com>
Date: Wed, 17 Apr 2013 11:51:38 +0200
Subject: [PATCH] Remove warnings
---
src/integrator-force-exact.cpp | 2 +-
unitTesting/dummy.cpp | 2 +-
unitTesting/test_djj.cpp | 5 +++--
unitTesting/test_results.cpp | 2 --
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/integrator-force-exact.cpp b/src/integrator-force-exact.cpp
index 40e01a3..ed96ec4 100644
--- a/src/integrator-force-exact.cpp
+++ b/src/integrator-force-exact.cpp
@@ -133,7 +133,7 @@ static void eigenDecomp( const ml::Matrix& M,
{
for( unsigned int j=0;j<SIZE;++j ){ P(i,j)=vr(i,j); }
eig(i)=evals(i).real();
- if( fabsf(evals(i).imag())>1e-5 )
+ if( fabsf(static_cast<float>(evals(i).imag()))>1e-5 )
{
SOT_THROW ExceptionDynamic( ExceptionDynamic::INTEGRATION,
"Error imaginary part not null. ",
diff --git a/unitTesting/dummy.cpp b/unitTesting/dummy.cpp
index e912bea..ef8e85c 100644
--- a/unitTesting/dummy.cpp
+++ b/unitTesting/dummy.cpp
@@ -18,7 +18,7 @@
* with sot-dynamic. If not, see <http://www.gnu.org/licenses/>.
*/
-int main (int argc, char** argv)
+int main (int , char** )
{
}
diff --git a/unitTesting/test_djj.cpp b/unitTesting/test_djj.cpp
index 4ec9d62..0538e8a 100644
--- a/unitTesting/test_djj.cpp
+++ b/unitTesting/test_djj.cpp
@@ -50,7 +50,7 @@ void DisplayDynamicRobotInformation(CjrlDynamicRobot *aDynamicRobot)
}
-void DisplayMatrix(MAL_MATRIX(,double) &aJ)
+void DisplayMatrix(MAL_MATRIX(&aJ,double))
{
for(unsigned int i=0;i<6;i++)
{
@@ -175,7 +175,8 @@ int main(int argc, char *argv[])
vector<CjrlJoint *> aVec = aHDR->jointVector();
CjrlJoint * aJoint = aVec[22];
aJoint->computeJacobianJointWrtConfig();
- MAL_MATRIX(,double) aJ = aJoint->jacobianJointWrtConfig();
+ MAL_MATRIX(aJ,double);
+ aJ = aJoint->jacobianJointWrtConfig();
DisplayMatrix(aJ);
/* Get Waist joint. */
diff --git a/unitTesting/test_results.cpp b/unitTesting/test_results.cpp
index 275db56..d951fec 100644
--- a/unitTesting/test_results.cpp
+++ b/unitTesting/test_results.cpp
@@ -126,8 +126,6 @@ int main(int argc, char * argv[])
string aValue("true");
aHDR->setProperty(aProperty,aValue);
aHDR2->setProperty(aProperty,aValue);
- int NbOfDofs = aHDR->numberDof();
- // cout << "NbOfDofs: " << NbOfDofs << endl;
while(!ActualStateFile.eof())
{
for(unsigned int i=0;i<100;i++)
--
GitLab