[Robotflow-cvs] RobotFlow/MARIE/include MarieCommandBehavior.h,1.2,1.3 MarieDataMap.h,1.2,1.3

[Carle C. <car...@us...>]

Update of /cvsroot/robotflow/RobotFlow/MARIE/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv344/MARIE/include

Modified Files:
	MarieCommandBehavior.h MarieDataMap.h 
Log Message:
updated with latest modifications in MARIE

Index: MarieDataMap.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieDataMap.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieDataMap.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieDataMap.h	10 Mar 2005 20:59:00 -0000	1.3
***************
*** 28,41 ****
  
  //MARIE data types include
! #include "DataMap.h"            
  
  namespace marie
  {
!   class MarieDataMap : public MarieObject, public DataMap {
       
       public:
                   
       MarieDataMap();  
!      MarieDataMap (const DataMap &data);
           
       //from BufferedNode   
--- 28,41 ----
  
  //MARIE data types include
! #include "DataAssociativeMap.h"            
  
  namespace marie
  {
!   class MarieDataMap : public MarieObject, public DataAssociativeMap {
       
       public:
                   
       MarieDataMap();  
!      MarieDataMap (const DataAssociativeMap &data);
           
       //from BufferedNode   

Index: MarieCommandBehavior.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/MARIE/include/MarieCommandBehavior.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MarieCommandBehavior.h	2 Jan 2005 14:43:57 -0000	1.2
--- MarieCommandBehavior.h	10 Mar 2005 20:59:00 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
       int m_behaviorNameInID;
       int m_behaviorActivationInID;
+      int m_behaviorResultsInID;
       
       //outputs