[Personalrobots-commit] SF.net SVN: personalrobots: [290] pkg/trunk

[<ge...@us...>]

Revision: 290
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=290&view=rev
Author:   gerkey
Date:     2008-05-02 09:43:31 -0700 (Fri, 02 May 2008)

Log Message:
-----------
porting nodes

Modified Paths:
--------------
    pkg/trunk/3rdparty/player/manifest.xml
    pkg/trunk/unported/erratic_player/erratic_player.cc
    pkg/trunk/unported/gmapping/playerwrapper/playergfswrapper.cpp

Modified: pkg/trunk/3rdparty/player/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/player/manifest.xml	2008-05-02 16:43:03 UTC (rev 289)
+++ pkg/trunk/3rdparty/player/manifest.xml	2008-05-02 16:43:31 UTC (rev 290)
@@ -12,7 +12,7 @@
 <license>LGPL</license>
 <url>http://playerstage.sf.net</url>
 <export>
-  <cpp lflags="-Xlinker -rpath ${prefix}/player/lib -L${prefix}/player/lib -lplayercore -lplayerxdr -lplayerutils -lplayererror" cflags="-I${prefix}/player/include/player-2.2"/>
+  <cpp lflags="-Xlinker -rpath ${prefix}/player/lib -L${prefix}/player/lib -lplayerdrivers -lplayercore -lplayerxdr -lplayerutils -lplayererror" cflags="-I${prefix}/player/include/player-2.2"/>
 </export>
 </package>
 

Modified: pkg/trunk/unported/erratic_player/erratic_player.cc
===================================================================
--- pkg/trunk/unported/erratic_player/erratic_player.cc	2008-05-02 16:43:03 UTC (rev 289)
+++ pkg/trunk/unported/erratic_player/erratic_player.cc	2008-05-02 16:43:31 UTC (rev 290)
@@ -151,8 +151,10 @@
 };
 
 int
-main(void)
+main(int argc, char** argv)
 {
+  ros::init(argc, argv);
+
   ErraticNode en;
   Message* msg;
 
@@ -192,7 +194,7 @@
       en.odom.stall = pdata->stall;
 
       // Publish the new data
-      publish("odom", odom);
+      en.publish("odom", en.odom);
 
       printf("Published new odom: (%.3f,%.3f,%.3f)\n", 
              en.odom.px, en.odom.py, en.odom.pyaw);

Modified: pkg/trunk/unported/gmapping/playerwrapper/playergfswrapper.cpp
===================================================================
--- pkg/trunk/unported/gmapping/playerwrapper/playergfswrapper.cpp	2008-05-02 16:43:03 UTC (rev 289)
+++ pkg/trunk/unported/gmapping/playerwrapper/playergfswrapper.cpp	2008-05-02 16:43:31 UTC (rev 290)
@@ -22,6 +22,8 @@
  *
  *****************************************************************/
 
+#include <float.h>
+
 #include <gui/qparticleviewer.h>
 #include <gui/qgraphpainter.h>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.