diff --git a/src/integrator-force-exact.cpp b/src/integrator-force-exact.cpp index 40e01a38986e97484cb61f274e463668d1630e33..ed96ec46809ca70f5178f827170f10c9651ca026 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 e912bea6052385121245ce8eb8dd977f018403ff..ef8e85c486b9d392e80927993f5060ab0ec9c068 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 4ec9d62a20d7977b9a24d958e81d4a58172ee8f1..0538e8a52105074cf027e77cae9c8aedee2254b0 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 275db56dcd6fb5382db7fec6a8a8a10868609d25..d951fec7b241243fe4ec5afae646133a08cc5d37 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++)