From: Dominic L. <ma...@us...> - 2005-03-29 15:21:35
|
Update of /cvsroot/robotflow/RobotFlow/Devices/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Devices/src Modified Files: CANON_VCC4.cc EVID30.cc LaserDevice.cc SICKLMS200.cc SNCRZ30.cc SerialDriver.cc V4L2Capture.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: V4L2Capture.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/V4L2Capture.cc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** V4L2Capture.cc 2 Jan 2005 14:43:55 -0000 1.14 --- V4L2Capture.cc 29 Mar 2005 15:20:39 -0000 1.15 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class V4L2Capture; *************** *** 235,238 **** --- 238,244 ---- }; + + }//namespace RobotFlow + /*========================================================================= capture.cc *************** *** 731,732 **** --- 737,739 ---- return true; } + Index: SerialDriver.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SerialDriver.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SerialDriver.cc 2 Jan 2005 14:43:55 -0000 1.2 --- SerialDriver.cc 29 Mar 2005 15:20:39 -0000 1.3 *************** *** 28,31 **** --- 28,34 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { /*********************************************/ *************** *** 120,121 **** --- 123,126 ---- close(fd); } + + }//namespace RobotFlow Index: EVID30.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/EVID30.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EVID30.cc 2 Jan 2005 14:43:55 -0000 1.8 --- EVID30.cc 29 Mar 2005 15:20:38 -0000 1.9 *************** *** 38,41 **** --- 38,44 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class EVID30; *************** *** 866,868 **** --- 869,873 ---- + }//namespace RobotFlow + #endif Index: SICKLMS200.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SICKLMS200.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SICKLMS200.cc 2 Jan 2005 14:43:55 -0000 1.3 --- SICKLMS200.cc 29 Mar 2005 15:20:39 -0000 1.4 *************** *** 22,26 **** --- 22,28 ---- using namespace std; + using namespace FD; + namespace RobotFlow { DECLARE_NODE(SICKLMS200) *************** *** 145,147 **** ! --- 147,149 ---- ! }//namespace RobotFlow Index: SNCRZ30.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/SNCRZ30.cc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SNCRZ30.cc 2 Jan 2005 14:43:55 -0000 1.21 --- SNCRZ30.cc 29 Mar 2005 15:20:39 -0000 1.22 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(SNCRZ30); *************** *** 911,912 **** --- 914,917 ---- } } + + }//namespace RobotFlow Index: CANON_VCC4.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/CANON_VCC4.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CANON_VCC4.cc 2 Jan 2005 14:43:55 -0000 1.6 --- CANON_VCC4.cc 29 Mar 2005 15:20:38 -0000 1.7 *************** *** 37,40 **** --- 37,43 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class CANON_VCC4; *************** *** 821,824 **** } ! #endif --- 824,827 ---- } ! }//namespace RobotFlow #endif Index: LaserDevice.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Devices/src/LaserDevice.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LaserDevice.cc 2 Jan 2005 14:43:55 -0000 1.3 --- LaserDevice.cc 29 Mar 2005 15:20:39 -0000 1.4 *************** *** 22,26 **** --- 22,28 ---- ///////////////////// using namespace std; + using namespace FD; + namespace RobotFlow { // Maths stuff *************** *** 1246,1247 **** --- 1248,1251 ---- return nBytes; } + + }//namespace RobotFlow |