Update of /cvsroot/robotflow/RobotFlow/MARIE/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6197/src
Modified Files:
newMarieDataNull.cpp
Log Message:
Remove useless Flowdesigner types for MARIE. Add MarieObject as a dataAbstract container.
Remove multiple inheritance.
Index: newMarieDataNull.cpp
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/src/newMarieDataNull.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** newMarieDataNull.cpp 12 Sep 2005 13:17:32 -0000 1.1
--- newMarieDataNull.cpp 12 Sep 2005 22:43:05 -0000 1.2
***************
*** 20,24 ****
*/
#include "MarieObject.h"
! #include "MarieDataNull.h"
#include "BufferedNode.h"
#include <sstream>
--- 20,24 ----
*/
#include "MarieObject.h"
! #include "DataNull.h"
#include "BufferedNode.h"
#include <sstream>
***************
*** 65,71 ****
{
//create new DataNull
! MarieDataNull *dNull = new MarieDataNull();
! out[count] = ObjectRef(dNull);
}
};//class newMarieDataNull
--- 65,71 ----
{
//create new DataNull
! DataNull *dNull = new DataNull();
! out[count] = ObjectRef(new MarieObject(dNull));
}
};//class newMarieDataNull
|
