[TeamTalk 34]: [571] TeamTalk/Agents/PrimitiveComm: Fixed resume execution.

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070405/21e7bc1c/attachment.html
-------------- next part --------------
Modified: TeamTalk/Agents/PrimitiveComm/Makefile
===================================================================
--- TeamTalk/Agents/PrimitiveComm/Makefile	2007-04-05 18:34:29 UTC (rev 570)
+++ TeamTalk/Agents/PrimitiveComm/Makefile	2007-04-05 18:44:23 UTC (rev 571)
@@ -2,6 +2,10 @@
 
 INCLUDES = -I. -I$(BOEINGLIB_DIR)/boeing -I$(BOEINGLIB_DIR)/coralshared
 
+ifdef $(WIN32)
+  INCLUDES += -Iwincompat
+endif
+
 VERBOSE = 1
 
 DEP_ECHO   = @echo Dependency: $@
@@ -24,11 +28,11 @@
 
 LIBRARIES = libboeingrobotserver.a
 
+all: $(LIBRARIES)
+
 # Include the dependencies
 -include $(OBJECTS:.o=.d)
 
-all: $(LIBRARIES)
-
 libboeingrobotserver.a: $(OBJECTS)
 	$(LINK_ECHO)
 	$(Q)ar cru $@ $(OBJECTS)

Modified: TeamTalk/Agents/PrimitiveComm/robot_packet2.cpp
===================================================================
--- TeamTalk/Agents/PrimitiveComm/robot_packet2.cpp	2007-04-05 18:34:29 UTC (rev 570)
+++ TeamTalk/Agents/PrimitiveComm/robot_packet2.cpp	2007-04-05 18:44:23 UTC (rev 571)
@@ -256,7 +256,7 @@
   if(action_head == "pause")
     return new MsgCmdPause(sender, tstamp, m->priority, m->taskid, m->action);
   if(action_head == "resume")
-    return new MsgCmdPause(sender, tstamp, m->priority, m->taskid, m->action);
+    return new MsgCmdResume(sender, tstamp, m->priority, m->taskid, m->action);
   if(action_head == "follow")
     return new MsgCmdFollow(sender, tstamp, m->priority, m->taskid, m->action);
   if(action_head == "cover")
@@ -702,4 +702,4 @@
   }
   return out;
 }
-*/
\ No newline at end of file
+*/