Merge pull request #55 from olivier-stasse/master

Olivier Stasse · web-flow · commit 935ac1e8cc71 · 2018-07-13T07:50:42.000+02:00
Fix warnings.
diff --git a/include/sot/core/trajectory.hh b/include/sot/core/trajectory.hh
@@ -120,7 +120,7 @@ public:
   }
   friend std::ostream& operator <<(std::ostream& stream, const timestamp& ats)
   {
-    stream << ats.secs_ + 0.000001*ats.nsecs_;
+    stream << ats.secs_ + 0.000001*(long double)ats.nsecs_;
     return stream;
   }
 };
diff --git a/src/sot/flags.cpp b/src/sot/flags.cpp
@@ -85,7 +85,7 @@ operator[] (const unsigned int& i) const
     res = flags[i];
   else res=0; 
   //cout<<"["<<i<<"] "<<res+0<<"||"<<(!res)+0<<std::endl;
-  if( reverse ) return ~res;//(!res);
+  if( reverse ) return static_cast<char>(~res);//(!res);
   return res;
 }
 
@@ -94,8 +94,8 @@ char operator>> (const Flags& f,const int& i)
 {
   const div_t q = div(i,8); 
 
-  char res = f[q.quot] >> q.rem;
-  res |= f[q.quot+1] << (8-q.rem);
+  char res = static_cast<char>(f[q.quot] >> q.rem);
+  res = static_cast<char>(res | f[q.quot+1] << (8-q.rem));
   
   return res;
 }
@@ -126,7 +126,7 @@ set( const unsigned int & idx )
 {
   unsigned int d= (idx/8), m=(idx%8);
 
-  char brik = (reverse)?(255-(1<<m)):(1<<m);
+  char brik = static_cast<char>((reverse)?(255-(1<<m)):(1<<m));
 
   if( flags.size()>d )
     {
@@ -140,7 +140,7 @@ set( const unsigned int & idx )
 		   << flags.size() <<" "<<d << std::endl;
       if(! reverse )
 	{
-	  for( unsigned i=flags.size();i<d;++i ) add((char)0);
+	  for( std::vector<char>::size_type i=flags.size();i<d;++i ) add((char)0);
 	  add(brik);
 	}
     }
@@ -152,7 +152,7 @@ unset( const unsigned int & idx )
 {
   unsigned int d= (idx/8), m=(idx%8);
 
-  char brik = (reverse)?(1<<m):(255-(1<<m));
+  char brik = static_cast<char>((reverse)?(1<<m):(255-(1<<m)));
   if( flags.size()>d )
     {
       sotDEBUG(45) << "List long enough. Modify." << std::endl;
@@ -164,7 +164,7 @@ unset( const unsigned int & idx )
       sotDEBUG(45) << "List not long enough. Add." << std::endl;
      if( reverse )
        {
-	 for( unsigned i=flags.size();i<d;++i ) add((char)255);
+	 for( std::vector<char>::size_type i=flags.size();i<d;++i ) add((char)255);
 	 add(brik);
        }
     }
@@ -197,13 +197,13 @@ Flags& Flags::
 operator&= ( const Flags& f2 ) 
 { 
   Flags &f1=*this;
-  const unsigned int max=std::max(flags.size(),f2.flags.size());
+  const std::vector<char>::size_type max=std::max(flags.size(),f2.flags.size());
   if( flags.size()<max ){ flags.resize(max); }
   bool revres = reverse&&f2.reverse;
   char c; int pos = 0;
   for( unsigned int i=0;i<max;++i )
     {
-      c=f1[i]&f2[i]; if(revres)  c=0xff-c; 
+      c=f1[i]&f2[i]; if(revres)  c=static_cast<char>(0xff-c); 
       flags[i]=c; if(c) pos=i+1;
     }
   flags.resize(pos);reverse=revres;
@@ -214,7 +214,7 @@ Flags& Flags::
 operator|= ( const Flags& f2 ) 
 { 
   Flags &f1=*this;
-  const unsigned int max=std::max(flags.size(),f2.flags.size());
+  const std::vector<char>::size_type max=std::max(flags.size(),f2.flags.size());
   if( flags.size()<max ){ flags.resize(max); }
   bool revres = reverse||f2.reverse;
   char c; int pos = 0;
@@ -223,7 +223,7 @@ operator|= ( const Flags& f2 )
       //cout<<"DGi ";displaybool(cout,f1[i],false); cout<<" "; displaybool(cout,f2[i],false); cout<<endl; 
       c=f1[i]|f2[i]; 
       //cout<<"DGr ";displaybool(cout,c,false); cout<<" "; displaybool(cout,c,revres); cout<<endl; 
-      if(revres)  c=0xff-c; 
+      if(revres)  c=static_cast<char>(0xff-c); 
       flags[i]=c; if(c) pos=i+1;
     }
   flags.resize(pos); reverse=revres;
@@ -242,7 +242,7 @@ operator|= ( const bool& b ){ if(b) { flags.clear(); reverse=true; } return *thi
 std::ostream& operator<< (std::ostream& os, const Flags& fl )
 {
   if( fl.reverse ) os << "...11111 ";
-  unsigned int s = fl.flags.size();
+  std::vector<char>::size_type s = fl.flags.size();
   for( unsigned int i=0;i<fl.flags.size();++i )
     {
       char c=fl.flags[s-i-1];
@@ -279,8 +279,8 @@ std::istream& operator>> (std::istream& is, Flags& fl )
 	    else total=10;
 	    break;
 	  }
-	case '0': cur &= (~(0x01 << (7-count++))) ; break;
-	case '1': cur |= (0x01 << (7-count++)) ; break;
+	case '0': cur = static_cast<char>(cur & ~(0x01 << (7-count++))) ; break;
+	case '1': cur = static_cast<char>(cur | 0x01 << (7-count++)) ; break;
 	case '#': 
 	  {
 	    char cnot; is.get(cnot);
@@ -330,35 +330,35 @@ std::istream& operator>> (std::istream& is, Flags& fl )
   total=0;
   for( std::list<char>::iterator iter = listing.begin();iter!=listing.end();++iter )
     {
-      insert = ((*iter)<<count);
-      insert &= (~MASK[count]);
-      cur = (MASK[count])&(cur>>(8-count));
+      insert = static_cast<char>((*iter)<<count);
+      insert = static_cast<char>(insert & ~MASK[count]);
+      cur = static_cast<char>((MASK[count])&(cur>>(8-count)));
 
       insert |= cur;
       cur = *iter; 
       
-      if( reverse ) fl.flags[total++] = ~insert;
+      if( reverse ) fl.flags[total++] = static_cast<char>(~insert);
       else fl.flags[total++] = insert;
       sotDEBUG(25) << "Insert " << displaybool(insert) <<endl;
     }
 
   if( count>0 )
     {
       sotDEBUG(25) << "Cur fin " << displaybool(cur) <<endl;
-      cur = (MASK[count])&(cur>>(8-count));
+      cur = static_cast<char>((MASK[count])&(cur>>(8-count)));
       
       sotDEBUG(25) << "Cur fin >> " <<8-count<<":" << displaybool(cur) <<endl;
       sotDEBUG(25) << "Mask fin "<<0+count<<": " << displaybool(MASK[count]) <<endl;
       
-      cur &= MASK[count];
+      cur = static_cast<char>(cur &MASK[count]);
       if( reverse ) 
 	{
-	  cur |= ~MASK[count];
-	  fl.flags[total++] = ~cur;
+	  cur = static_cast<char>(cur |~MASK[count]);
+	  fl.flags[total++] = static_cast<char>(~cur);
 	}
       else
 	{
-	  cur &= MASK[count];
+	  cur = static_cast<char>(cur &MASK[count]);
 	  fl.flags[total++] = cur;
 	}
       sotDEBUG(25) << "Insert fin " << displaybool(cur) <<endl;
diff --git a/src/tools/periodic-call.cpp b/src/tools/periodic-call.cpp
@@ -185,7 +185,7 @@ display( std::ostream& os ) const
 static std::string readLineStr( istringstream& args )
 {
   stringbuf* pbuf=args.rdbuf();
-  const unsigned int size = pbuf->in_avail();
+  const std::streamsize size = pbuf->in_avail();
   char * buffer = new char[ size+1 ];
   pbuf->sgetn( buffer,size );
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public:`
`120`	`120`	`}`
`121`	`121`	`friend std::ostream& operator <<(std::ostream& stream, const timestamp& ats)`
`122`	`122`	`{`
`123`		`- stream << ats.secs_ + 0.000001*ats.nsecs_;`
	`123`	`+ stream << ats.secs_ + 0.000001*(long double)ats.nsecs_;`
`124`	`124`	`return stream;`
`125`	`125`	`}`
`126`	`126`	`};`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ operator[] (const unsigned int& i) const`
`85`	`85`	`res = flags[i];`
`86`	`86`	`else res=0;`
`87`	`87`	`//cout<<"["<<i<<"] "<<res+0<<"\|\|"<<(!res)+0<<std::endl;`
`88`		`- if( reverse ) return ~res;//(!res);`
	`88`	`+ if( reverse ) return static_cast<char>(~res);//(!res);`
`89`	`89`	`return res;`
`90`	`90`	`}`
`91`	`91`
`@@ -94,8 +94,8 @@ char operator>> (const Flags& f,const int& i)`
`94`	`94`	`{`
`95`	`95`	`const div_t q = div(i,8);`
`96`	`96`
`97`		`- char res = f[q.quot] >> q.rem;`
`98`		`- res \|= f[q.quot+1] << (8-q.rem);`
	`97`	`+ char res = static_cast<char>(f[q.quot] >> q.rem);`
	`98`	`+ res = static_cast<char>(res \| f[q.quot+1] << (8-q.rem));`
`99`	`99`
`100`	`100`	`return res;`
`101`	`101`	`}`
`@@ -126,7 +126,7 @@ set( const unsigned int & idx )`
`126`	`126`	`{`
`127`	`127`	`unsigned int d= (idx/8), m=(idx%8);`
`128`	`128`
`129`		`- char brik = (reverse)?(255-(1<<m)):(1<<m);`
	`129`	`+ char brik = static_cast<char>((reverse)?(255-(1<<m)):(1<<m));`
`130`	`130`
`131`	`131`	`if( flags.size()>d )`
`132`	`132`	`{`
`@@ -140,7 +140,7 @@ set( const unsigned int & idx )`
`140`	`140`	`<< flags.size() <<" "<<d << std::endl;`
`141`	`141`	`if(! reverse )`
`142`	`142`	`{`
`143`		`- for( unsigned i=flags.size();i<d;++i ) add((char)0);`
	`143`	`+ for( std::vector<char>::size_type i=flags.size();i<d;++i ) add((char)0);`
`144`	`144`	`add(brik);`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -152,7 +152,7 @@ unset( const unsigned int & idx )`
`152`	`152`	`{`
`153`	`153`	`unsigned int d= (idx/8), m=(idx%8);`
`154`	`154`
`155`		`- char brik = (reverse)?(1<<m):(255-(1<<m));`
	`155`	`+ char brik = static_cast<char>((reverse)?(1<<m):(255-(1<<m)));`
`156`	`156`	`if( flags.size()>d )`
`157`	`157`	`{`
`158`	`158`	`sotDEBUG(45) << "List long enough. Modify." << std::endl;`
`@@ -164,7 +164,7 @@ unset( const unsigned int & idx )`
`164`	`164`	`sotDEBUG(45) << "List not long enough. Add." << std::endl;`
`165`	`165`	`if( reverse )`
`166`	`166`	`{`
`167`		`- for( unsigned i=flags.size();i<d;++i ) add((char)255);`
	`167`	`+ for( std::vector<char>::size_type i=flags.size();i<d;++i ) add((char)255);`
`168`	`168`	`add(brik);`
`169`	`169`	`}`
`170`	`170`	`}`
`@@ -197,13 +197,13 @@ Flags& Flags::`
`197`	`197`	`operator&= ( const Flags& f2 )`
`198`	`198`	`{`
`199`	`199`	`Flags &f1=*this;`
`200`		`- const unsigned int max=std::max(flags.size(),f2.flags.size());`
	`200`	`+ const std::vector<char>::size_type max=std::max(flags.size(),f2.flags.size());`
`201`	`201`	`if( flags.size()<max ){ flags.resize(max); }`
`202`	`202`	`bool revres = reverse&&f2.reverse;`
`203`	`203`	`char c; int pos = 0;`
`204`	`204`	`for( unsigned int i=0;i<max;++i )`
`205`	`205`	`{`
`206`		`- c=f1[i]&f2[i]; if(revres) c=0xff-c;`
	`206`	`+ c=f1[i]&f2[i]; if(revres) c=static_cast<char>(0xff-c);`
`207`	`207`	`flags[i]=c; if(c) pos=i+1;`
`208`	`208`	`}`
`209`	`209`	`flags.resize(pos);reverse=revres;`
`@@ -214,7 +214,7 @@ Flags& Flags::`
`214`	`214`	`operator\|= ( const Flags& f2 )`
`215`	`215`	`{`
`216`	`216`	`Flags &f1=*this;`
`217`		`- const unsigned int max=std::max(flags.size(),f2.flags.size());`
	`217`	`+ const std::vector<char>::size_type max=std::max(flags.size(),f2.flags.size());`
`218`	`218`	`if( flags.size()<max ){ flags.resize(max); }`
`219`	`219`	`bool revres = reverse\|\|f2.reverse;`
`220`	`220`	`char c; int pos = 0;`
`@@ -223,7 +223,7 @@ operator\|= ( const Flags& f2 )`
`223`	`223`	`//cout<<"DGi ";displaybool(cout,f1[i],false); cout<<" "; displaybool(cout,f2[i],false); cout<<endl;`
`224`	`224`	`c=f1[i]\|f2[i];`
`225`	`225`	`//cout<<"DGr ";displaybool(cout,c,false); cout<<" "; displaybool(cout,c,revres); cout<<endl;`
`226`		`- if(revres) c=0xff-c;`
	`226`	`+ if(revres) c=static_cast<char>(0xff-c);`
`227`	`227`	`flags[i]=c; if(c) pos=i+1;`
`228`	`228`	`}`
`229`	`229`	`flags.resize(pos); reverse=revres;`
`@@ -242,7 +242,7 @@ operator\|= ( const bool& b ){ if(b) { flags.clear(); reverse=true; } return *thi`
`242`	`242`	`std::ostream& operator<< (std::ostream& os, const Flags& fl )`
`243`	`243`	`{`
`244`	`244`	`if( fl.reverse ) os << "...11111 ";`
`245`		`- unsigned int s = fl.flags.size();`
	`245`	`+ std::vector<char>::size_type s = fl.flags.size();`
`246`	`246`	`for( unsigned int i=0;i<fl.flags.size();++i )`
`247`	`247`	`{`
`248`	`248`	`char c=fl.flags[s-i-1];`
`@@ -279,8 +279,8 @@ std::istream& operator>> (std::istream& is, Flags& fl )`
`279`	`279`	`else total=10;`
`280`	`280`	`break;`
`281`	`281`	`}`
`282`		`- case '0': cur &= (~(0x01 << (7-count++))) ; break;`
`283`		`- case '1': cur \|= (0x01 << (7-count++)) ; break;`
	`282`	`+ case '0': cur = static_cast<char>(cur & ~(0x01 << (7-count++))) ; break;`
	`283`	`+ case '1': cur = static_cast<char>(cur \| 0x01 << (7-count++)) ; break;`
`284`	`284`	`case '#':`
`285`	`285`	`{`
`286`	`286`	`char cnot; is.get(cnot);`
`@@ -330,35 +330,35 @@ std::istream& operator>> (std::istream& is, Flags& fl )`
`330`	`330`	`total=0;`
`331`	`331`	`for( std::list<char>::iterator iter = listing.begin();iter!=listing.end();++iter )`
`332`	`332`	`{`
`333`		`- insert = ((*iter)<<count);`
`334`		`- insert &= (~MASK[count]);`
`335`		`- cur = (MASK[count])&(cur>>(8-count));`
	`333`	`+ insert = static_cast<char>((*iter)<<count);`
	`334`	`+ insert = static_cast<char>(insert & ~MASK[count]);`
	`335`	`+ cur = static_cast<char>((MASK[count])&(cur>>(8-count)));`
`336`	`336`
`337`	`337`	`insert \|= cur;`
`338`	`338`	`cur = *iter;`
`339`	`339`
`340`		`- if( reverse ) fl.flags[total++] = ~insert;`
	`340`	`+ if( reverse ) fl.flags[total++] = static_cast<char>(~insert);`
`341`	`341`	`else fl.flags[total++] = insert;`
`342`	`342`	`sotDEBUG(25) << "Insert " << displaybool(insert) <<endl;`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`if( count>0 )`
`346`	`346`	`{`
`347`	`347`	`sotDEBUG(25) << "Cur fin " << displaybool(cur) <<endl;`
`348`		`- cur = (MASK[count])&(cur>>(8-count));`
	`348`	`+ cur = static_cast<char>((MASK[count])&(cur>>(8-count)));`
`349`	`349`
`350`	`350`	`sotDEBUG(25) << "Cur fin >> " <<8-count<<":" << displaybool(cur) <<endl;`
`351`	`351`	`sotDEBUG(25) << "Mask fin "<<0+count<<": " << displaybool(MASK[count]) <<endl;`
`352`	`352`
`353`		`- cur &= MASK[count];`
	`353`	`+ cur = static_cast<char>(cur &MASK[count]);`
`354`	`354`	`if( reverse )`
`355`	`355`	`{`
`356`		`- cur \|= ~MASK[count];`
`357`		`- fl.flags[total++] = ~cur;`
	`356`	`+ cur = static_cast<char>(cur \|~MASK[count]);`
	`357`	`+ fl.flags[total++] = static_cast<char>(~cur);`
`358`	`358`	`}`
`359`	`359`	`else`
`360`	`360`	`{`
`361`		`- cur &= MASK[count];`
	`361`	`+ cur = static_cast<char>(cur &MASK[count]);`
`362`	`362`	`fl.flags[total++] = cur;`
`363`	`363`	`}`
`364`	`364`	`sotDEBUG(25) << "Insert fin " << displaybool(cur) <<endl;`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ display( std::ostream& os ) const`
`185`	`185`	`static std::string readLineStr( istringstream& args )`
`186`	`186`	`{`
`187`	`187`	`stringbuf* pbuf=args.rdbuf();`
`188`		`- const unsigned int size = pbuf->in_avail();`
	`188`	`+ const std::streamsize size = pbuf->in_avail();`
`189`	`189`	`char * buffer = new char[ size+1 ];`
`190`	`190`	`pbuf->sgetn( buffer,size );`
`191`	`191`