From: Carle C. <car...@us...> - 2005-09-12 13:16:35
|
Update of /cvsroot/robotflow/RobotFlow/MARIE/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24362/MARIE/src Modified Files: extractMarieRequestSystem.cpp newMarieRequestSystem.cpp Log Message: change getID method call for the newest methods Index: newMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieRequestSystem.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** newMarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.7 --- newMarieRequestSystem.cpp 12 Sep 2005 13:16:27 -0000 1.8 *************** *** 111,115 **** request->setCommand(*commandString); request->setData(*dataString); ! request->setID(*requestID); request->setState(*stateString); --- 111,115 ---- request->setCommand(*commandString); request->setData(*dataString); ! request->setRequestID(*requestID); request->setState(*stateString); Index: extractMarieRequestSystem.cpp =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/extractMarieRequestSystem.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extractMarieRequestSystem.cpp 7 Sep 2005 21:12:48 -0000 1.4 --- extractMarieRequestSystem.cpp 12 Sep 2005 13:16:27 -0000 1.5 *************** *** 98,102 **** (*outputs[m_commandID].buffer)[count] = ObjectRef(new String(request->getCommand())); (*outputs[m_dataID].buffer)[count] = ObjectRef(new String(request->getData())); ! (*outputs[m_requestIDID].buffer)[count] = ObjectRef(Int::alloc(request->getID())); (*outputs[m_stateID].buffer)[count] = ObjectRef(new String(request->getState())); } --- 98,102 ---- (*outputs[m_commandID].buffer)[count] = ObjectRef(new String(request->getCommand())); (*outputs[m_dataID].buffer)[count] = ObjectRef(new String(request->getData())); ! (*outputs[m_requestIDID].buffer)[count] = ObjectRef(Int::alloc(request->getRequestID())); (*outputs[m_stateID].buffer)[count] = ObjectRef(new String(request->getState())); } |