Revision: 8493
http://playerstage.svn.sourceforge.net/playerstage/?rev=8493&view=rev
Author: natepak
Date: 2010-01-11 18:29:07 +0000 (Mon, 11 Jan 2010)
Log Message:
-----------
Fixed some include problems with webgazebo
Modified Paths:
--------------
code/gazebo/trunk/webgazebo/WebGazebo.cc
code/gazebo/trunk/webgazebo/WebGazebo.hh
code/gazebo/trunk/webgazebo/client.cc
code/gazebo/trunk/webgazebo/main.cc
Modified: code/gazebo/trunk/webgazebo/WebGazebo.cc
===================================================================
--- code/gazebo/trunk/webgazebo/WebGazebo.cc 2010-01-11 14:58:32 UTC (rev
8492)
+++ code/gazebo/trunk/webgazebo/WebGazebo.cc 2010-01-11 18:29:07 UTC (rev
8493)
@@ -27,6 +27,7 @@
#include "WebGazebo.hh"
+#include <iostream>
#include <fstream>
#include <stdio.h>
@@ -218,9 +219,9 @@
}
bool
-WebGazebo::ClockRunFor( double seconds )
+WebGazebo::ClockRunFor( uint32_t msec )
{
- unsigned int us = (unsigned int)rint(seconds*1e6);
+ unsigned int us = (unsigned int)rint(msec*1e3);
this->simIface->Go(us, boost::bind(&WebGazebo::GoCallback, this));
// Wait for the callback to fire
boost::mutex::scoped_lock lock(this->goMutex);
Modified: code/gazebo/trunk/webgazebo/WebGazebo.hh
===================================================================
--- code/gazebo/trunk/webgazebo/WebGazebo.hh 2010-01-11 14:58:32 UTC (rev
8492)
+++ code/gazebo/trunk/webgazebo/WebGazebo.hh 2010-01-11 18:29:07 UTC (rev
8493)
@@ -89,7 +89,7 @@
virtual bool ClockStop() { simIface->Pause(); return true;}
- virtual bool ClockRunFor( double seconds );
+ virtual bool ClockRunFor( uint32_t msec );
// end WebSim Interface ====================================================
Modified: code/gazebo/trunk/webgazebo/client.cc
===================================================================
--- code/gazebo/trunk/webgazebo/client.cc 2010-01-11 14:58:32 UTC (rev
8492)
+++ code/gazebo/trunk/webgazebo/client.cc 2010-01-11 18:29:07 UTC (rev
8493)
@@ -67,7 +67,7 @@
g_cnt++;
if(g_cnt >= g_target_cnt)
{
- printf("Total: %d transactions / %.6fs = %.6f tran/s\n",
+ printf("Total: %lu transactions / %.6fs = %.6f tran/s\n",
g_cnt, g_dt, g_cnt / g_dt);
exit(0);
}
Modified: code/gazebo/trunk/webgazebo/main.cc
===================================================================
--- code/gazebo/trunk/webgazebo/main.cc 2010-01-11 14:58:32 UTC (rev 8492)
+++ code/gazebo/trunk/webgazebo/main.cc 2010-01-11 18:29:07 UTC (rev 8493)
@@ -28,6 +28,7 @@
#include "WebGazebo.hh"
#include <stdlib.h>
+#include <stdio.h>
#define USAGE "USAGE: webgazebo [-f <file.fed>] [-h <host>] [-p <port>] [-d
<dtol>] [-a <atol>]\n"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
