[Robotflow-cvs] RobotFlow/MARIE/src MarieCommandBehavior.cpp,1.5,1.6 MarieCommandCamera.cpp,1.8,1.9 MarieCommandJoystick.cpp,1.4,1.5 MarieCommandMotor.cpp,1.6,1.7 MarieDataBumper.cpp,1.3,1.4 MarieDataCamera.cpp,1.5,1.6 MarieDataIR.cpp,1.3,1.4 MarieDataLaser.cpp,1.6,1.7 MarieDataMap.cpp,1.4,1.5 MarieDataNull.cpp,1.3,1.4 MarieDataOdometry.cpp,1.5,1.6 MarieDataRaw.cpp,1.5,1.6 MarieDataSonar.cpp,1.5,1.6 MarieLoad.cpp,1.6,1.7 MariePeek.cpp,1.5,1.6 MariePull.cpp,1.5,1.6 MariePush.cpp,1.2,1.3 MarieRequestSystem.cpp,1.3,1.4 MarieSave.cpp,1.4,1.5 extractMarieCommandBehavior.cpp,1.5,1.6 extractMarieCommandCamera.cpp,1.2,1.3 extractMarieCommandJoystick.cpp,1.2,1.3 extractMarieCommandMotor.cpp,1.2,1.3 extractMarieDataBumper.cpp,1.2,1.3 extractMarieDataCamera.cpp,1.2,1.3 extractMarieDataIR.cpp,1.3,1.4 extractMarieDataLaser.cpp,1.3,1.4 extractMarieDataMap.cpp,1.3,1.4 extractMarieDataOdometry.cpp,1.2,1.3 extractMarieDataRaw.cpp,1.2,1.3 extractMarieDataSonar.cpp,1.3,1.4 extractMarieRequestSystem.cpp,1.2,1.3 isMarieDataNull.cpp,1.2,1.3 newMarieCommandBehavior.cpp,1.5,1.6 newMarieCommandCamera.cpp,1.3,1.4 newMarieCommandJoystick.cpp,1.2,1.3 newMarieCommandMotor.cpp,1.2,1.3 newMarieDataBumper.cpp,1.2,1.3 newMarieDataCamera.cpp,1.3,1.4 newMarieDataIR.cpp,1.2,1.3 newMarieDataLaser.cpp,1.2,1.3 newMarieDataMap.cpp,1.3,1.4 newMarieDataOdometry.cpp,1.2,1.3 newMarieDataRaw.cpp,1.2,1.3 newMarieDataSonar.cpp,1.2,1.3 newMarieRequestSystem.cpp,1.5,1.6

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

Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/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:
Now using the RobotFlow namespace and the FD namespace

Index: newMarieDataMap.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataMap.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** newMarieDataMap.cpp	5 Jan 2005 00:45:30 -0000	1.3
--- newMarieDataMap.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataIR.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataIR.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extractMarieDataIR.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- extractMarieDataIR.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieRequestSystem.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieRequestSystem.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieRequestSystem.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- extractMarieRequestSystem.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 24,27 ****
--- 24,28 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataBumper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataBumper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataBumper.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- MarieDataBumper.cpp	29 Mar 2005 15:20:42 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataSonar.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataSonar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieDataSonar.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MarieDataSonar.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieCommandJoystick.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandJoystick.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieCommandJoystick.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- extractMarieCommandJoystick.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataOdometry.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataOdometry.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieDataOdometry.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MarieDataOdometry.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataCamera.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieDataCamera.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MarieDataCamera.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieCommandJoystick.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandJoystick.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarieCommandJoystick.cpp	2 Jan 2005 14:43:57 -0000	1.4
--- MarieCommandJoystick.cpp	29 Mar 2005 15:20:42 -0000	1.5
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataOdometry.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataOdometry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieDataOdometry.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- extractMarieDataOdometry.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataCamera.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieDataCamera.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- extractMarieDataCamera.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataBumper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataBumper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataBumper.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataBumper.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MariePush.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePush.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MariePush.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- MariePush.cpp	29 Mar 2005 15:20:42 -0000	1.3
***************
*** 28,31 ****
--- 28,32 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MariePeek.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePeek.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MariePeek.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MariePeek.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataMap.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataMap.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extractMarieDataMap.cpp	2 Jan 2005 14:43:58 -0000	1.3
--- extractMarieDataMap.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 30,33 ****
--- 30,34 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataIR.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataIR.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataIR.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataIR.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieCommandMotor.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandMotor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieCommandMotor.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- extractMarieCommandMotor.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataNull.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataNull.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataNull.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- MarieDataNull.cpp	29 Mar 2005 15:20:42 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataRaw.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataRaw.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieDataRaw.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- extractMarieDataRaw.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieCommandMotor.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandMotor.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieCommandMotor.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieCommandMotor.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieCommandMotor.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandMotor.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarieCommandMotor.cpp	2 Jan 2005 14:43:57 -0000	1.6
--- MarieCommandMotor.cpp	29 Mar 2005 15:20:42 -0000	1.7
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataMap.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataMap.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarieDataMap.cpp	10 Mar 2005 20:59:35 -0000	1.4
--- MarieDataMap.cpp	29 Mar 2005 15:20:42 -0000	1.5
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataSonar.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataSonar.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extractMarieDataSonar.cpp	2 Jan 2005 14:43:58 -0000	1.3
--- extractMarieDataSonar.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandCamera.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieCommandCamera.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- extractMarieCommandCamera.cpp	29 Mar 2005 15:20:42 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandBehavior.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** newMarieCommandBehavior.cpp	11 Mar 2005 18:54:49 -0000	1.5
--- newMarieCommandBehavior.cpp	29 Mar 2005 15:20:43 -0000	1.6
***************
*** 30,33 ****
--- 30,34 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataBumper.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataBumper.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extractMarieDataBumper.cpp	2 Jan 2005 14:43:57 -0000	1.2
--- extractMarieDataBumper.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieCommandBehavior.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** extractMarieCommandBehavior.cpp	10 Mar 2005 20:59:34 -0000	1.5
--- extractMarieCommandBehavior.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 31,34 ****
--- 31,35 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataIR.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataIR.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieDataIR.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- MarieDataIR.cpp	29 Mar 2005 15:20:42 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: extractMarieDataLaser.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieDataLaser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** extractMarieDataLaser.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- extractMarieDataLaser.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieCommandJoystick.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandJoystick.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieCommandJoystick.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieCommandJoystick.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieLoad.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieLoad.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarieLoad.cpp	2 Jan 2005 14:43:57 -0000	1.6
--- MarieLoad.cpp	29 Mar 2005 15:20:42 -0000	1.7
***************
*** 28,31 ****
--- 28,32 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataSonar.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataSonar.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataSonar.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataSonar.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: isMarieDataNull.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/isMarieDataNull.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** isMarieDataNull.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- isMarieDataNull.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 4,7 ****
--- 4,8 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie {

Index: newMarieDataLaser.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataLaser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataLaser.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataLaser.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataOdometry.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataOdometry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataOdometry.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataOdometry.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataCamera.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** newMarieDataCamera.cpp	2 Jan 2005 14:43:58 -0000	1.3
--- newMarieDataCamera.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieCommandCamera.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** newMarieCommandCamera.cpp	2 Jan 2005 14:43:58 -0000	1.3
--- newMarieCommandCamera.cpp	29 Mar 2005 15:20:43 -0000	1.4
***************
*** 25,28 ****
--- 25,29 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: newMarieDataRaw.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataRaw.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newMarieDataRaw.cpp	2 Jan 2005 14:43:58 -0000	1.2
--- newMarieDataRaw.cpp	29 Mar 2005 15:20:43 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieCommandCamera.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandCamera.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MarieCommandCamera.cpp	2 Jan 2005 14:43:57 -0000	1.8
--- MarieCommandCamera.cpp	29 Mar 2005 15:20:42 -0000	1.9
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieCommandBehavior.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieCommandBehavior.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieCommandBehavior.cpp	10 Mar 2005 20:59:34 -0000	1.5
--- MarieCommandBehavior.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 28,31 ****
--- 28,33 ----
  
  using namespace std;
+ using namespace FD;
+ using namespace RobotFlow;
  
  namespace marie

Index: newMarieRequestSystem.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** newMarieRequestSystem.cpp	2 Jan 2005 14:43:58 -0000	1.5
--- newMarieRequestSystem.cpp	29 Mar 2005 15:20:43 -0000	1.6
***************
*** 24,27 ****
--- 24,28 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MariePull.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MariePull.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MariePull.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MariePull.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataLaser.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataLaser.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MarieDataLaser.cpp	2 Jan 2005 14:43:57 -0000	1.6
--- MarieDataLaser.cpp	29 Mar 2005 15:20:42 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieSave.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieSave.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MarieSave.cpp	2 Jan 2005 14:43:57 -0000	1.4
--- MarieSave.cpp	29 Mar 2005 15:20:42 -0000	1.5
***************
*** 28,31 ****
--- 28,32 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieDataRaw.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieDataRaw.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MarieDataRaw.cpp	2 Jan 2005 14:43:57 -0000	1.5
--- MarieDataRaw.cpp	29 Mar 2005 15:20:42 -0000	1.6
***************
*** 27,30 ****
--- 27,31 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie

Index: MarieRequestSystem.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/MarieRequestSystem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MarieRequestSystem.cpp	2 Jan 2005 14:43:57 -0000	1.3
--- MarieRequestSystem.cpp	29 Mar 2005 15:20:42 -0000	1.4
***************
*** 26,29 ****
--- 26,30 ----
  
  using namespace std;
+ using namespace FD;
  
  namespace marie