[Robotflow-cvs] RobotFlow/MARIE/include MarieCommandBehavior.h,1.1,1.2 MarieCommandCamera.h,1.2,1.3 MarieCommandJoystick.h,1.1,1.2 MarieCommandMotor.h,1.1,1.2 MarieDataBumper.h,1.1,1.2 MarieDataCamera.h,1.1,1.2 MarieDataIR.h,1.1,1.2 MarieDataLaser.h,1.1,1.2 MarieDataMap.h,1.1,1.2 MarieDataNull.h,1.1,1.2 MarieDataOdometry.h,1.1,1.2 MarieDataRaw.h,1.1,1.2 MarieDataSonar.h,1.1,1.2 MarieLoad.h,1.1,1.2 MarieObject.h,1.1,1.2 MariePeek.h,1.1,1.2 MariePull.h,1.1,1.2 MariePush.h,1.1,1.2 MarieRequestSystem.h,1.1,1.2 MarieSave.h,1.1,1.2

[Dominic L. <ma...@us...>]

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

Modified Files:
	MarieCommandBehavior.h MarieCommandCamera.h 
	MarieCommandJoystick.h MarieCommandMotor.h MarieDataBumper.h 
	MarieDataCamera.h MarieDataIR.h MarieDataLaser.h 
	MarieDataMap.h MarieDataNull.h MarieDataOdometry.h 
	MarieDataRaw.h MarieDataSonar.h MarieLoad.h MarieObject.h 
	MariePeek.h MariePull.h MariePush.h MarieRequestSystem.h 
	MarieSave.h 
Log Message:
removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace.


Index: MarieDataBumper.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataBumper.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataBumper.h	4 Aug 2004 17:49:49 -0000	1.1
--- MarieDataBumper.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode   
!      MarieDataBumper(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
--- 41,48 ----
       
       //from BufferedNode   
!      MarieDataBumper(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       

Index: MarieCommandMotor.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandMotor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandMotor.h	30 May 2004 12:34:07 -0000	1.1
--- MarieCommandMotor.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 42,49 ****
       
       //from BufferedNode   
!      MarieCommandMotor(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       
--- 42,49 ----
       
       //from BufferedNode   
!      MarieCommandMotor(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       

Index: MariePeek.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePeek.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MariePeek.h	14 Jun 2004 18:36:35 -0000	1.1
--- MariePeek.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 39,43 ****
    public:
    
!      MariePeek(string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };
--- 39,43 ----
    public:
    
!      MariePeek(std::string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };

Index: MarieCommandJoystick.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandJoystick.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandJoystick.h	29 Jul 2004 18:30:03 -0000	1.1
--- MarieCommandJoystick.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode   
!      MarieCommandJoystick(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
--- 41,48 ----
       
       //from BufferedNode   
!      MarieCommandJoystick(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       

Index: MarieLoad.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieLoad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieLoad.h	30 May 2004 12:34:07 -0000	1.1
--- MarieLoad.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 39,43 ****
    public:
    
!      MarieLoad(string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };
--- 39,43 ----
    public:
    
!      MarieLoad(std::string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };

Index: MarieObject.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieObject.h	30 May 2004 12:34:07 -0000	1.1
--- MarieObject.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 53,57 ****
     public:
       
!      MarieObject(string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {}
       virtual void copyDataAbstract(DataAbstract *data) = 0;
        
--- 53,57 ----
     public:
       
!      MarieObject(std::string nodeName, ParameterSet params) : BufferedNode(nodeName,params) {}
       virtual void copyDataAbstract(DataAbstract *data) = 0;
        

Index: MarieDataSonar.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataSonar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataSonar.h	30 May 2004 12:34:07 -0000	1.1
--- MarieDataSonar.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 40,47 ****
       
       //from BufferedNode
!      MarieDataSonar(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data); 
          
--- 40,47 ----
       
       //from BufferedNode
!      MarieDataSonar(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data); 
          

Index: MarieCommandCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandCamera.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieCommandCamera.h	24 Aug 2004 17:34:24 -0000	1.2
--- MarieCommandCamera.h	2 Jan 2005 14:43:57 -0000	1.3
***************
*** 41,48 ****
       
       //from BufferedNode   
!      MarieCommandCamera(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
--- 41,48 ----
       
       //from BufferedNode   
!      MarieCommandCamera(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       

Index: MarieDataIR.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataIR.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataIR.h	4 Aug 2004 17:49:49 -0000	1.1
--- MarieDataIR.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode
!      MarieDataIR(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       
--- 41,48 ----
       
       //from BufferedNode
!      MarieDataIR(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       

Index: MarieDataCamera.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataCamera.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataCamera.h	30 May 2004 12:34:07 -0000	1.1
--- MarieDataCamera.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
           
       //from BufferedNode   
!      MarieDataCamera(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       
--- 41,48 ----
           
       //from BufferedNode   
!      MarieDataCamera(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       

Index: MarieDataLaser.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataLaser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataLaser.h	30 May 2004 12:34:07 -0000	1.1
--- MarieDataLaser.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode
!      MarieDataLaser(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       
--- 41,48 ----
       
       //from BufferedNode
!      MarieDataLaser(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       

Index: MarieDataOdometry.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataOdometry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataOdometry.h	30 May 2004 12:34:07 -0000	1.1
--- MarieDataOdometry.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 40,47 ****
       
       //from BufferedNode
!      MarieDataOdometry(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);   
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);   
       virtual void copyDataAbstract(DataAbstract *data); 
       
--- 40,47 ----
       
       //from BufferedNode
!      MarieDataOdometry(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);   
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);   
       virtual void copyDataAbstract(DataAbstract *data); 
       

Index: MarieDataRaw.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataRaw.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataRaw.h	22 Jul 2004 21:00:52 -0000	1.1
--- MarieDataRaw.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode
!      MarieDataRaw(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       
--- 41,48 ----
       
       //from BufferedNode
!      MarieDataRaw(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);       
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);  
       

Index: MarieRequestSystem.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieRequestSystem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieRequestSystem.h	22 Sep 2004 19:47:07 -0000	1.1
--- MarieRequestSystem.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
           
       //from BufferedNode   
!      MarieRequestSystem(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       
--- 41,48 ----
           
       //from BufferedNode   
!      MarieRequestSystem(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       

Index: MariePull.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePull.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MariePull.h	14 Jun 2004 14:15:25 -0000	1.1
--- MariePull.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 39,43 ****
    public:
    
!      MariePull(string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };
--- 39,43 ----
    public:
    
!      MariePull(std::string nodeName, ParameterSet params);
       void calculate(int output_id, int count, Buffer &out);   
    };

Index: MarieSave.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieSave.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieSave.h	30 May 2004 12:34:07 -0000	1.1
--- MarieSave.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 35,39 ****
    public:
    
!      MarieSave(string nodeName, ParameterSet params);
    
       void calculate(int output_id, int count, Buffer &out);
--- 35,39 ----
    public:
    
!      MarieSave(std::string nodeName, ParameterSet params);
    
       void calculate(int output_id, int count, Buffer &out);

Index: MarieDataNull.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataNull.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataNull.h	7 Jun 2004 15:10:10 -0000	1.1
--- MarieDataNull.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 41,48 ****
       
       //from BufferedNode   
!      MarieDataNull(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);
       
--- 41,48 ----
       
       //from BufferedNode   
!      MarieDataNull(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);        
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);
       

Index: MarieCommandBehavior.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieCommandBehavior.h	30 May 2004 12:34:07 -0000	1.1
--- MarieCommandBehavior.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 40,47 ****
       
       //from BufferedNode   
!      MarieCommandBehavior(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);    
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);  
       virtual void copyDataAbstract(DataAbstract *data);
       
--- 40,47 ----
       
       //from BufferedNode   
!      MarieCommandBehavior(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out);    
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);  
       virtual void copyDataAbstract(DataAbstract *data);
       

Index: MarieDataMap.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MarieDataMap.h	22 Sep 2004 13:55:53 -0000	1.1
--- MarieDataMap.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 40,47 ****
           
       //from BufferedNode   
!      MarieDataMap(string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(ostream &out) const;
!      virtual void readFrom(istream &in=cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       
--- 40,47 ----
           
       //from BufferedNode   
!      MarieDataMap(std::string nodeName, ParameterSet params);
       virtual void calculate(int output_id, int count, Buffer &out); 
!      virtual void printOn(std::ostream &out) const;
!      virtual void readFrom(std::istream &in=std::cin);
       virtual void copyDataAbstract(DataAbstract *data);   
       

Index: MariePush.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MariePush.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MariePush.h	14 Jun 2004 14:15:25 -0000	1.1
--- MariePush.h	2 Jan 2005 14:43:57 -0000	1.2
***************
*** 35,39 ****
    public:
    
!      MariePush(string nodeName, ParameterSet params);
    
       void calculate(int output_id, int count, Buffer &out);
--- 35,39 ----
    public:
    
!      MariePush(std::string nodeName, ParameterSet params);
    
       void calculate(int output_id, int count, Buffer &out);