Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/MARIE/src Modified Files: MarieCommandBehavior.cpp MarieCommandCamera.cpp MarieCommandJoystick.cpp MarieCommandMotor.cpp MarieDataBumper.cpp MarieDataCamera.cpp MarieDataIR.cpp MarieDataLaser.cpp MarieDataMap.cpp MarieDataNull.cpp MarieDataOdometry.cpp MarieDataRaw.cpp MarieDataSonar.cpp MarieLoad.cpp MariePeek.cpp MariePull.cpp MariePush.cpp MarieRequestSystem.cpp MarieSave.cpp extractMarieCommandBehavior.cpp extractMarieCommandCamera.cpp extractMarieCommandJoystick.cpp extractMarieCommandMotor.cpp extractMarieDataBumper.cpp extractMarieDataCamera.cpp extractMarieDataIR.cpp extractMarieDataLaser.cpp extractMarieDataMap.cpp extractMarieDataOdometry.cpp extractMarieDataRaw.cpp extractMarieDataSonar.cpp extractMarieRequestSystem.cpp isMarieDataNull.cpp newMarieCommandBehavior.cpp newMarieCommandCamera.cpp newMarieCommandJoystick.cpp newMarieCommandMotor.cpp newMarieDataBumper.cpp newMarieDataCamera.cpp newMarieDataIR.cpp newMarieDataLaser.cpp newMarieDataMap.cpp newMarieDataOdometry.cpp newMarieDataRaw.cpp newMarieDataSonar.cpp newMarieRequestSystem.cpp Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: newMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataMap.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataMap.cpp 22 Sep 2004 14:47:42 -0000 1.1 --- newMarieDataMap.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 24,27 **** --- 24,29 ---- #include "CompositeType.h" + using namespace std; + namespace marie { Index: extractMarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataIR.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataIR.cpp 2 Nov 2004 14:10:05 -0000 1.2 --- extractMarieDataIR.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieRequestSystem.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieRequestSystem.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 23,26 **** --- 23,28 ---- #include <string> + using namespace std; + namespace marie { Index: MarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataBumper.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataSonar.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataSonar.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 25,28 **** --- 25,31 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: extractMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandJoystick.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandJoystick.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- extractMarieCommandJoystick.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataOdometry.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataOdometry.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 24,27 **** --- 24,30 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: MarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataCamera.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataCamera.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandJoystick.cpp 29 Oct 2004 14:07:20 -0000 1.3 --- MarieCommandJoystick.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: extractMarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataOdometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataOdometry.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- extractMarieDataOdometry.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataCamera.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataCamera.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- extractMarieDataCamera.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataBumper.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataBumper.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MariePush.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePush.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MariePush.cpp 14 Jun 2004 14:15:26 -0000 1.1 --- MariePush.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 27,30 **** --- 27,32 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MariePeek.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePeek.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MariePeek.cpp 10 Aug 2004 19:59:36 -0000 1.4 --- MariePeek.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: extractMarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataMap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataMap.cpp 1 Nov 2004 18:52:30 -0000 1.2 --- extractMarieDataMap.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 29,32 **** --- 29,34 ---- #include "CompositeType.h" + using namespace std; + namespace marie { Index: newMarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataIR.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataIR.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataIR.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandMotor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandMotor.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- extractMarieCommandMotor.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataNull.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataNull.cpp 10 Jun 2004 01:00:22 -0000 1.2 --- MarieDataNull.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 24,27 **** --- 24,30 ---- #include "MarieXMLDataFactory.h" + + using namespace std; + namespace marie { Index: extractMarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataRaw.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieDataRaw.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandMotor.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandMotor.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- newMarieCommandMotor.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieCommandMotor.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieCommandMotor.cpp 29 Oct 2004 14:07:20 -0000 1.5 --- MarieCommandMotor.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataMap.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataMap.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataMap.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: extractMarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataSonar.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataSonar.cpp 2 Nov 2004 14:10:05 -0000 1.2 --- extractMarieDataSonar.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandCamera.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandCamera.cpp 28 Oct 2004 15:03:30 -0000 1.1 --- extractMarieCommandCamera.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandBehavior.cpp 26 Oct 2004 19:47:05 -0000 1.1 --- newMarieCommandBehavior.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieDataBumper.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataBumper.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieDataBumper.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- extractMarieDataBumper.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: extractMarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** extractMarieCommandBehavior.cpp 28 Oct 2004 15:03:29 -0000 1.1 --- extractMarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieDataIR.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataIR.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieDataIR.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieDataIR.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: extractMarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataLaser.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extractMarieDataLaser.cpp 1 Nov 2004 18:52:30 -0000 1.2 --- extractMarieDataLaser.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandJoystick.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandJoystick.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieCommandJoystick.cpp 28 Oct 2004 18:11:48 -0000 1.1 --- newMarieCommandJoystick.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieLoad.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieLoad.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieLoad.cpp 17 Jun 2004 13:52:52 -0000 1.5 --- MarieLoad.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: newMarieDataSonar.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataSonar.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataSonar.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataSonar.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: isMarieDataNull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/isMarieDataNull.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** isMarieDataNull.cpp 1 Nov 2004 13:20:05 -0000 1.1 --- isMarieDataNull.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 2,5 **** --- 2,8 ---- #include "MarieDataNull.h" + + using namespace std; + namespace marie { Index: newMarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLaser.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataLaser.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataLaser.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataOdometry.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataOdometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataOdometry.cpp 28 Oct 2004 20:30:07 -0000 1.1 --- newMarieDataOdometry.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieDataCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataCamera.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieDataCamera.cpp 28 Oct 2004 20:30:07 -0000 1.2 --- newMarieDataCamera.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: newMarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandCamera.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** newMarieCommandCamera.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- newMarieCommandCamera.cpp 2 Jan 2005 14:43:58 -0000 1.3 *************** *** 24,27 **** --- 24,29 ---- #include <string> + using namespace std; + namespace marie { Index: newMarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataRaw.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** newMarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.1 --- newMarieDataRaw.cpp 2 Jan 2005 14:43:58 -0000 1.2 *************** *** 28,31 **** --- 28,33 ---- #include "MarieDataNull.h" + using namespace std; + namespace marie { Index: MarieCommandCamera.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MarieCommandCamera.cpp 29 Oct 2004 14:07:20 -0000 1.7 --- MarieCommandCamera.cpp 2 Jan 2005 14:43:57 -0000 1.8 *************** *** 26,29 **** --- 26,31 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieCommandBehavior.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieCommandBehavior.cpp 29 Oct 2004 14:07:20 -0000 1.3 --- MarieCommandBehavior.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: newMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** newMarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- newMarieRequestSystem.cpp 2 Jan 2005 14:43:58 -0000 1.5 *************** *** 23,26 **** --- 23,28 ---- #include <string> + using namespace std; + namespace marie { Index: MariePull.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePull.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MariePull.cpp 10 Aug 2004 19:59:36 -0000 1.4 --- MariePull.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 27,30 **** --- 27,32 ---- #include "MarieObject.h" + using namespace std; + namespace marie { Index: MarieDataLaser.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MarieDataLaser.cpp 29 Oct 2004 14:07:20 -0000 1.5 --- MarieDataLaser.cpp 2 Jan 2005 14:43:57 -0000 1.6 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: MarieSave.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieSave.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarieSave.cpp 14 Jun 2004 14:15:26 -0000 1.3 --- MarieSave.cpp 2 Jan 2005 14:43:57 -0000 1.4 *************** *** 27,30 **** --- 27,32 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { Index: MarieDataRaw.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataRaw.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarieDataRaw.cpp 29 Oct 2004 14:07:20 -0000 1.4 --- MarieDataRaw.cpp 2 Jan 2005 14:43:57 -0000 1.5 *************** *** 26,29 **** --- 26,31 ---- #include "Vector.h" + using namespace std; + namespace marie { Index: MarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieRequestSystem.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarieRequestSystem.cpp 29 Oct 2004 14:07:20 -0000 1.2 --- MarieRequestSystem.cpp 2 Jan 2005 14:43:57 -0000 1.3 *************** *** 25,28 **** --- 25,30 ---- #include "MarieXMLDataFactory.h" + using namespace std; + namespace marie { |