Update of /cvsroot/robotflow/RobotFlow/Generic/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Generic/src Modified Files: DictionaryLookup.cc KDNode.cc KDPQueue.cc KDPoint.cc KDTree.cc Random.cc TimeStamp.cc Timer.cc USleep.cc operators.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: Timer.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/Timer.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Timer.cc 2 Jan 2005 14:43:56 -0000 1.2 --- Timer.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 5,8 **** --- 5,11 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //(ER) for debugging *************** *** 219,220 **** --- 222,225 ---- } + + }//namespace RobotFlow Index: Random.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/Random.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Random.cc 2 Jan 2005 14:43:56 -0000 1.2 --- Random.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 7,11 **** --- 7,14 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + class Random; *************** *** 63,67 **** }; ! #endif --- 66,70 ---- }; ! }//namespace RobotFlow #endif Index: KDPQueue.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/KDPQueue.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDPQueue.cc 2 Jan 2005 14:43:56 -0000 1.2 --- KDPQueue.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 21,25 **** --- 21,28 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + static int KDPQUEUE_VAR_0 = Object::addObjectType<KDPQueue< double, KDPoint<unsigned char> > > ("KDPQueue<double,KDPoint<unsigned char>>", new ObjectFactory<KDPQueue< double, KDPoint<unsigned char> > > ("KDPQueue<double,KDPoint<unsigned char>>")); *************** *** 50,51 **** --- 53,56 ---- static int KDPQUEUE_VAR_10 = Object::addObjectType<KDPQueue< double, int > > ("KDPQueue<double,int>", new ObjectFactory<KDPQueue< double, int > > ("KDPQueue<double, int>")); + + }//namespace RobotFlow Index: TimeStamp.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/TimeStamp.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TimeStamp.cc 2 Jan 2005 14:43:56 -0000 1.2 --- TimeStamp.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 6,10 **** --- 6,13 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + class TimeStamp; *************** *** 71,73 **** --- 74,78 ---- + + }//namespace RobotFlow #endif Index: DictionaryLookup.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/DictionaryLookup.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DictionaryLookup.cc 2 Jan 2005 14:43:56 -0000 1.3 --- DictionaryLookup.cc 29 Mar 2005 15:20:41 -0000 1.4 *************** *** 24,27 **** --- 24,30 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { class DictionaryLookup; *************** *** 269,271 **** --- 272,277 ---- return selectedWord; } + + }//namespace RobotFLow + #endif Index: KDTree.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/KDTree.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDTree.cc 2 Jan 2005 14:43:56 -0000 1.2 --- KDTree.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 20,24 **** --- 20,27 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + DECLARE_TYPE(KDPoint<unsigned char>) DECLARE_TYPE(KDPoint<char>) *************** *** 32,33 **** --- 35,37 ---- DECLARE_TYPE(KDPoint<double>) + }//namespace RobotFlow Index: KDPoint.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/KDPoint.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDPoint.cc 2 Jan 2005 14:43:56 -0000 1.2 --- KDPoint.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 20,23 **** --- 20,26 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_TYPE(KDPoint<unsigned char>) *************** *** 31,32 **** --- 34,37 ---- DECLARE_TYPE(KDPoint<float>) DECLARE_TYPE(KDPoint<double>) + + }//namespace RobotFlow Index: KDNode.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/KDNode.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KDNode.cc 2 Jan 2005 14:43:56 -0000 1.2 --- KDNode.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 20,24 **** --- 20,27 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + DECLARE_TYPE(KDNode<unsigned char>) DECLARE_TYPE(KDNode<char>) *************** *** 31,32 **** --- 34,37 ---- DECLARE_TYPE(KDNode<float>) DECLARE_TYPE(KDNode<double>) + + }//namespace RobotFlow Index: operators.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/operators.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** operators.cc 26 Jul 2004 16:57:01 -0000 1.3 --- operators.cc 29 Mar 2005 15:20:41 -0000 1.4 *************** *** 11,14 **** --- 11,17 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { ObjectRef concatStringInt(ObjectRef op1, ObjectRef op2) { *************** *** 22,23 **** --- 25,28 ---- } REGISTER_DOUBLE_VTABLE(concatVtable,concatStringInt,String,Int); + + }//namespace RobotFlow Index: USleep.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Generic/src/USleep.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** USleep.cc 2 Jan 2005 14:43:56 -0000 1.2 --- USleep.cc 29 Mar 2005 15:20:41 -0000 1.3 *************** *** 9,13 **** --- 9,16 ---- using namespace std; + using namespace FD; + namespace RobotFlow { + class USleep; *************** *** 97,100 **** --- 100,104 ---- + }//namespace RobotFlow #endif |