[Robotflow-cvs] RobotFlow/MARIE/src MarieCommandBehavior.cpp,1.8,1.9 MarieCommandCamera.cpp,1.10,1.11 MarieCommandJoystick.cpp,1.6,1.7 MarieCommandMotor.cpp,1.8,1.9 MarieDataBumper.cpp,1.5,1.6 MarieDataLocalisation.cpp,1.6,1.7 MariePeek.cpp,1.6,1.7 MariePull.cpp,1.6,1.7 newMarieCommandBehavior.cpp,1.7,1.8 newMarieCommandJoystick.cpp,1.3,1.4 newMarieDataLocalisation.cpp,1.2,1.3

[Carle C. <car...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31382/MARIE/src

Modified Files:
	MarieCommandBehavior.cpp MarieCommandCamera.cpp 
	MarieCommandJoystick.cpp MarieCommandMotor.cpp 
	MarieDataBumper.cpp MarieDataLocalisation.cpp MariePeek.cpp 
	MariePull.cpp newMarieCommandBehavior.cpp 
	newMarieCommandJoystick.cpp newMarieDataLocalisation.cpp 
Log Message:
correct gcc4.0.1 warnings

Index: MarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** MarieCommandCamera.cpp	22 Aug 2005 21:21:07 -0000	1.10
--- MarieCommandCamera.cpp	22 Aug 2005 21:35:01 -0000	1.11
***************
*** 185,190 ****
        {
           MarieCommandCamera *command = NULL;
!          int relPan, relTilt, relZoom, relContrast, relBrightness = 0;
!          int absPan, absTilt, absZoom, absContrast, absBrightness = 0;
           std::bitset<10> state;
           
--- 185,199 ----
        {
           MarieCommandCamera *command = NULL;
!          int relPan = 0;
!          int relTilt = 0;
!          int relZoom = 0;
!          int relContrast = 0;
!          int relBrightness = 0;
!          int absPan = 0;
!          int absTilt = 0;
!          int absZoom = 0;
!          int absContrast = 0;
!          int absBrightness = 0;
!          
           std::bitset<10> state;
           

Index: newMarieCommandJoystick.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandJoystick.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** newMarieCommandJoystick.cpp	29 Mar 2005 15:20:43 -0000	1.3
--- newMarieCommandJoystick.cpp	22 Aug 2005 21:35:01 -0000	1.4
***************
*** 138,142 ****
  	MarieCommandJoystick *command = new MarieCommandJoystick();
  
! 	int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0;
  
  	//get x
--- 138,149 ----
  	MarieCommandJoystick *command = new MarieCommandJoystick();
  
! 	int x = 0;
!    int y = 0;
!    int xmin = 0;
!    int ymin = 0;
!    int xmax = 0;
!    int ymax = 0;
!    int nbButtons = 0;
!    int buttonState = 0;
  
  	//get x

Index: newMarieDataLocalisation.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLocalisation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataLocalisation.cpp	27 Jun 2005 22:43:36 -0000	1.2
--- newMarieDataLocalisation.cpp	22 Aug 2005 21:35:01 -0000	1.3
***************
*** 94,98 ****
          data = new MarieDataLocalisation();
          
!         for(int i = 0; i < inputData->size(); i++)
          {
            RCPtr<SourceInfo> sourceInfoData = inputData->getIndex(i);
--- 94,98 ----
          data = new MarieDataLocalisation();
          
!         for(unsigned int i = 0; i < inputData->size(); i++)
          {
            RCPtr<SourceInfo> sourceInfoData = inputData->getIndex(i);

Index: MarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MarieCommandBehavior.cpp	22 Aug 2005 21:21:07 -0000	1.8
--- MarieCommandBehavior.cpp	22 Aug 2005 21:35:01 -0000	1.9
***************
*** 159,163 ****
          
           //initialize to false (not activated)
!          for (int i = 0; i < vect->size(); i++) 
           {
              //TODO check if behavior exists
--- 159,163 ----
          
           //initialize to false (not activated)
!          for (unsigned int i = 0; i < vect->size(); i++) 
           {
              //TODO check if behavior exists

Index: MariePull.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePull.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MariePull.cpp	29 Mar 2005 15:20:42 -0000	1.6
--- MariePull.cpp	22 Aug 2005 21:35:01 -0000	1.7
***************
*** 93,97 ****
           }
        }
!       int pos = my_string.find("<?xml version=\"1.0\"?>");
        
        if (pos != 0 && pos != string::npos) 
--- 93,97 ----
           }
        }
!       unsigned int pos = my_string.find("<?xml version=\"1.0\"?>");
        
        if (pos != 0 && pos != string::npos) 

Index: MarieCommandMotor.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MarieCommandMotor.cpp	22 Aug 2005 21:21:07 -0000	1.8
--- MarieCommandMotor.cpp	22 Aug 2005 21:35:01 -0000	1.9
***************
*** 102,106 ****
       {
          MarieCommandMotor *command = NULL;
!         int velocity, rotation = 0;
       
          //get all inputs
--- 102,107 ----
       {
          MarieCommandMotor *command = NULL;
!         int velocity = 0;
!         int rotation = 0;
       
          //get all inputs

Index: MarieCommandJoystick.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarieCommandJoystick.cpp	22 Aug 2005 21:21:07 -0000	1.6
--- MarieCommandJoystick.cpp	22 Aug 2005 21:35:01 -0000	1.7
***************
*** 162,166 ****
        {
           MarieCommandJoystick *command = NULL;
!          int x, y, xmin, ymin, xmax, ymax, nbButtons, buttonState = 0;
           
           //get all inputs       
--- 162,173 ----
        {
           MarieCommandJoystick *command = NULL;
!          int x = 0;
!          int y = 0;
!          int xmin = 0;
!          int ymin = 0;
!          int xmax = 0;
!          int ymax = 0;
!          int nbButtons = 0;
!          int buttonState = 0;
           
           //get all inputs       

Index: MarieDataBumper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieDataBumper.cpp	22 Aug 2005 21:21:07 -0000	1.5
--- MarieDataBumper.cpp	22 Aug 2005 21:35:01 -0000	1.6
***************
*** 102,106 ****
        {
           MarieDataBumper *command = NULL;
!          int nbBumpers, bumperState = 0;
           
           //get all inputs       
--- 102,107 ----
        {
           MarieDataBumper *command = NULL;
!          int nbBumpers = 0;
!          int bumperState = 0;
           
           //get all inputs       

Index: newMarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** newMarieCommandBehavior.cpp	9 Jun 2005 20:37:22 -0000	1.7
--- newMarieCommandBehavior.cpp	22 Aug 2005 21:35:01 -0000	1.8
***************
*** 91,95 ****
           MarieCommandBehavior *cb = new MarieCommandBehavior();
            
!          for(int i = 0; i < (*vector).size(); i++)
           {
              ObjectRef elementPtr = (*vector)[i];
--- 91,95 ----
           MarieCommandBehavior *cb = new MarieCommandBehavior();
            
!          for(unsigned int i = 0; i < (*vector).size(); i++)
           {
              ObjectRef elementPtr = (*vector)[i];

Index: MarieDataLocalisation.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLocalisation.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarieDataLocalisation.cpp	22 Aug 2005 21:21:07 -0000	1.6
--- MarieDataLocalisation.cpp	22 Aug 2005 21:35:01 -0000	1.7
***************
*** 145,149 ****
             vector = new Vector<ObjectRef>(*inputData);
             
!            for(int i = 0; i < vector->size(); i++)
             {
               RCPtr<SourceInfo> sourceInfoData = vector->getIndex(i);
--- 145,149 ----
             vector = new Vector<ObjectRef>(*inputData);
             
!            for(unsigned int i = 0; i < vector->size(); i++)
             {
               RCPtr<SourceInfo> sourceInfoData = vector->getIndex(i);

Index: MariePeek.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePeek.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MariePeek.cpp	29 Mar 2005 15:20:42 -0000	1.6
--- MariePeek.cpp	22 Aug 2005 21:35:01 -0000	1.7
***************
*** 94,98 ****
        }
    
!       int pos = my_string.find("<?xml version=\"1.0\"?>");
        
        if (pos != 0 && pos != string::npos) 
--- 94,98 ----
        }
    
!       unsigned int pos = my_string.find("<?xml version=\"1.0\"?>");
        
        if (pos != 0 && pos != string::npos)