From: Dominic L. <ma...@us...> - 2005-03-29 15:21:37
|
Update of /cvsroot/robotflow/RobotFlow/Pioneer2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Pioneer2/src Modified Files: PSOSPacket.cc Pioneer2Connect.cc Pioneer2Gripper.cc Pioneer2GripperState.cc Pioneer2PacketManager.cc Pioneer2RotationIn.cc Pioneer2SIP.cc Pioneer2SIPExtract.cc Pioneer2Sonars.cc Pioneer2VelocityIn.cc Pioneer2VelocityOut.cc Pioneer2Voltage.cc Pioneer2xyPos.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: Pioneer2Voltage.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2Voltage.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2Voltage.cc 2 Jan 2005 14:43:58 -0000 1.3 --- Pioneer2Voltage.cc 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2Voltage; *************** *** 171,174 **** --- 174,178 ---- }; + }//namespace RobotFlow #endif Index: Pioneer2Connect.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2Connect.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Pioneer2Connect.cc 2 Jan 2005 14:43:58 -0000 1.9 --- Pioneer2Connect.cc 29 Mar 2005 15:20:44 -0000 1.10 *************** *** 33,36 **** --- 33,39 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(Pioneer2Connect) *************** *** 143,144 **** --- 146,149 ---- } + + }//namespace RobotFlow Index: Pioneer2GripperState.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2GripperState.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pioneer2GripperState.cc 1 May 2002 19:22:40 -0000 1.2 --- Pioneer2GripperState.cc 29 Mar 2005 15:20:44 -0000 1.3 *************** *** 17,29 **** #include "BufferedNode.h" - #include "Pioneer2GripperState.h" - DECLARE_TYPE(TP2GripperState); - using namespace std; ! class Pioneer2GripperState; DECLARE_NODE(Pioneer2GripperState) --- 17,30 ---- #include "BufferedNode.h" #include "Pioneer2GripperState.h" using namespace std; + using namespace FD; ! namespace RobotFlow { + class Pioneer2GripperState; + + DECLARE_TYPE(TP2GripperState); DECLARE_NODE(Pioneer2GripperState) *************** *** 200,201 **** --- 201,204 ---- const unsigned char Pioneer2GripperState::LIFT_MOVING = 64; const unsigned char Pioneer2GripperState::GRIPPER_MOVING = 128; + + }//namespace RobotFlow Index: Pioneer2SIP.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2SIP.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pioneer2SIP.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Pioneer2SIP.cc 29 Mar 2005 15:20:44 -0000 1.3 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2SIP; *************** *** 103,106 **** --- 106,110 ---- }; + }//namespace RobotFlow #endif Index: Pioneer2Gripper.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2Gripper.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Pioneer2Gripper.cc 18 Apr 2002 20:18:50 -0000 1.2 --- Pioneer2Gripper.cc 29 Mar 2005 15:20:44 -0000 1.3 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2Gripper; *************** *** 106,109 **** }; ! #endif --- 109,112 ---- }; ! }//namespace RobotFlow #endif Index: PSOSPacket.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/PSOSPacket.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PSOSPacket.cc 2 Jan 2005 14:43:58 -0000 1.6 --- PSOSPacket.cc 29 Mar 2005 15:20:44 -0000 1.7 *************** *** 26,29 **** --- 26,32 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { PSOSPacket::PSOSPacket() *************** *** 225,226 **** --- 228,231 ---- return m_packet[pos]; } + + }//namespace RobotFlow Index: Pioneer2PacketManager.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2PacketManager.cc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Pioneer2PacketManager.cc 2 Jan 2005 14:43:58 -0000 1.18 --- Pioneer2PacketManager.cc 29 Mar 2005 15:20:44 -0000 1.19 *************** *** 33,36 **** --- 33,39 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { Pioneer2PacketManager* Pioneer2PacketManager::m_instance = NULL; *************** *** 1261,1262 **** --- 1264,1267 ---- } } + + }//namespace RobotFlow Index: Pioneer2VelocityOut.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2VelocityOut.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2VelocityOut.cc 2 Jan 2005 14:43:58 -0000 1.3 --- Pioneer2VelocityOut.cc 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2VelocityOut; *************** *** 107,111 **** }; ! #endif --- 110,114 ---- }; ! }//namespace RobotFlow #endif Index: Pioneer2RotationIn.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2RotationIn.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2RotationIn.cc 2 Jan 2005 14:43:58 -0000 1.3 --- Pioneer2RotationIn.cc 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2RotationIn; *************** *** 147,149 **** --- 150,155 ---- }; + + }//namespace RobotFlow + #endif Index: Pioneer2xyPos.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2xyPos.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2xyPos.cc 2 Jan 2005 14:43:58 -0000 1.3 --- Pioneer2xyPos.cc 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2xyPos; *************** *** 159,161 **** --- 162,166 ---- }; + + }//namespace RobotFlow #endif Index: Pioneer2SIPExtract.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2SIPExtract.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Pioneer2SIPExtract.cc 22 Apr 2003 20:56:14 -0000 1.3 --- Pioneer2SIPExtract.cc 29 Mar 2005 15:20:44 -0000 1.4 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2SIPExtract; *************** *** 254,257 **** --- 257,262 ---- }; + }//namespace RobotFlow + #endif Index: Pioneer2VelocityIn.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2VelocityIn.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Pioneer2VelocityIn.cc 2 Jan 2005 14:43:58 -0000 1.5 --- Pioneer2VelocityIn.cc 29 Mar 2005 15:20:44 -0000 1.6 *************** *** 22,25 **** --- 22,28 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2VelocityIn; *************** *** 110,114 **** ! #endif --- 113,117 ---- ! }//namespace RobotFlow #endif Index: Pioneer2Sonars.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Pioneer2/src/Pioneer2Sonars.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Pioneer2Sonars.cc 2 Jan 2005 14:43:58 -0000 1.7 --- Pioneer2Sonars.cc 29 Mar 2005 15:20:44 -0000 1.8 *************** *** 23,26 **** --- 23,29 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class Pioneer2Sonars; *************** *** 147,149 **** --- 150,154 ---- }; + + }//namespace RobotFlow #endif |