From: Dominic L. <ma...@us...> - 2005-01-02 14:44:49
|
Update of /cvsroot/robotflow/RobotFlow/Devices/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Devices/include Modified Files: LaserDevice.h SICKLMS200.h SNCRZ30.h Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: SNCRZ30.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SNCRZ30.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SNCRZ30.h 26 Aug 2004 20:05:47 -0000 1.9 --- SNCRZ30.h 2 Jan 2005 14:43:55 -0000 1.10 *************** *** 32,36 **** public: ! SNCRZ30(string nodeName, ParameterSet params); ~SNCRZ30(); --- 32,36 ---- public: ! SNCRZ30(std::string nodeName, ParameterSet params); ~SNCRZ30(); Index: LaserDevice.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/LaserDevice.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LaserDevice.h 29 Apr 2002 01:17:15 -0000 1.1 --- LaserDevice.h 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 19,23 **** public: // Constructor ! LaserDevice(string serial_port); // Destructor --- 19,23 ---- public: // Constructor ! LaserDevice(std::string serial_port); // Destructor *************** *** 87,91 **** pthread_t m_Receiving_thread; pthread_mutex_t m_list_lock; ! list<string> m_received; }; --- 87,91 ---- pthread_t m_Receiving_thread; pthread_mutex_t m_list_lock; ! std::list<std::string> m_received; }; Index: SICKLMS200.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/include/SICKLMS200.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SICKLMS200.h 29 Apr 2002 01:17:15 -0000 1.1 --- SICKLMS200.h 2 Jan 2005 14:43:55 -0000 1.2 *************** *** 12,16 **** public: ! SICKLMS200(string nodeName, ParameterSet params); ~SICKLMS200(); virtual void calculate(int output_id, int count, Buffer &out); --- 12,16 ---- public: ! SICKLMS200(std::string nodeName, ParameterSet params); ~SICKLMS200(); virtual void calculate(int output_id, int count, Buffer &out); |