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

[<rdi...@us...>]

Revision: 9964
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=9964&view=rev
Author:   rdiankov
Date:     2009-01-22 17:03:29 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
64bit portability issues with printing

Modified Paths:
--------------
    pkg/trunk/3rdparty/openrave/Makefile
    pkg/trunk/calibration/laser_camera_calibration/manifest.xml
    pkg/trunk/openrave_planning/orrosplanning/src/plugindefs.h
    pkg/trunk/openrave_planning/orrosplanning/src/rosrobotcontroller.h
    pkg/trunk/util/robot_self_filter/src/robotlinks_filter_node.cpp

Modified: pkg/trunk/3rdparty/openrave/Makefile
===================================================================
--- pkg/trunk/3rdparty/openrave/Makefile	2009-01-22 17:01:19 UTC (rev 9963)
+++ pkg/trunk/3rdparty/openrave/Makefile	2009-01-22 17:03:29 UTC (rev 9964)
@@ -2,7 +2,7 @@
 
 SVN_DIR = openrave_svn
 # Should really specify a revision
-SVN_REVISION = -r 610
+SVN_REVISION = -r 618
 SVN_URL = https://openrave.svn.sourceforge.net/svnroot/openrave
 include $(shell rospack find mk)/svn_checkout.mk
 

Modified: pkg/trunk/calibration/laser_camera_calibration/manifest.xml
===================================================================
--- pkg/trunk/calibration/laser_camera_calibration/manifest.xml	2009-01-22 17:01:19 UTC (rev 9963)
+++ pkg/trunk/calibration/laser_camera_calibration/manifest.xml	2009-01-22 17:03:29 UTC (rev 9964)
@@ -9,8 +9,9 @@
   <url>http://pr.willowgarage.com/wiki/laser_camera_calibration</url>
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
-  <depend package="robot_msgs" />
-  <depend package="std_msgs" />
+  <depend package="robot_msgs"/>
+  <depend package="std_msgs"/>
+  <depend package="rosrecord"/>
   <depend package="rospy"/>
   <depend package="rosoct"/>
   <depend package="openraveros"/>

Modified: pkg/trunk/openrave_planning/orrosplanning/src/plugindefs.h
===================================================================
--- pkg/trunk/openrave_planning/orrosplanning/src/plugindefs.h	2009-01-22 17:01:19 UTC (rev 9963)
+++ pkg/trunk/openrave_planning/orrosplanning/src/plugindefs.h	2009-01-22 17:03:29 UTC (rev 9964)
@@ -52,8 +52,13 @@
 #include <iostream>
 #include <sstream>
 
+#ifdef _MSC_VER
+#define PRIdS "Id"
+#else
+#define PRIdS "zd"
+#endif
+
 using namespace std;
-typedef unsigned int u32;
 
 #include <sys/timeb.h>    // ftime(), struct timeb
 

Modified: pkg/trunk/openrave_planning/orrosplanning/src/rosrobotcontroller.h
===================================================================
--- pkg/trunk/openrave_planning/orrosplanning/src/rosrobotcontroller.h	2009-01-22 17:01:19 UTC (rev 9963)
+++ pkg/trunk/openrave_planning/orrosplanning/src/rosrobotcontroller.h	2009-01-22 17:03:29 UTC (rev 9964)
@@ -260,7 +260,7 @@
             }
         }
         else
-            RAVELOG_WARNA("number of current values (%d) != desird values (%d)\n", _vcurvalues.size(), vnewvalues.size());
+            RAVELOG_WARNA("number of current values (%"PRIdS") != desird values (%"PRIdS")\n", _vcurvalues.size(), vnewvalues.size());
 
         FOREACH(ittrajcontroller, _listControllers) {
             if( !(*ittrajcontroller)->_srvTrajectoryStart ) {
@@ -552,7 +552,7 @@
                 if( bPopTrajectory ) {
                     FOREACH(ittraj, _listControllers)
                         (*ittraj)->_listTrajectories.pop_front();
-                    RAVELOG_DEBUGA("robot trajectory finished, left: %d\n", _listControllers.front()->_listTrajectories.size());
+                    RAVELOG_DEBUGA("robot trajectory finished, left: %"PRIdS"\n", _listControllers.front()->_listTrajectories.size());
                 }
 
                 if( _bIsDone != _listControllers.front()->_listTrajectories.size()==0 ) {

Modified: pkg/trunk/util/robot_self_filter/src/robotlinks_filter_node.cpp
===================================================================
--- pkg/trunk/util/robot_self_filter/src/robotlinks_filter_node.cpp	2009-01-22 17:01:19 UTC (rev 9963)
+++ pkg/trunk/util/robot_self_filter/src/robotlinks_filter_node.cpp	2009-01-22 17:03:29 UTC (rev 9964)
@@ -54,6 +54,12 @@
 
 #define FOREACH(it, v) for(typeof((v).begin()) it = (v).begin(); it != (v).end(); (it)++)
 
+#ifdef _MSC_VER
+#define PRIdS "Id"
+#else
+#define PRIdS "zd"
+#endif
+
 boost::shared_ptr<ros::Node> s_pmasternode;
 
 inline string _stdwcstombs(const wchar_t* pname)
@@ -151,7 +157,7 @@
         }
         
         RobotBase* probot = penv->GetRobots().front();    
-        ROS_INFO("generating convex hulls for robot %S, num links: %lu", probot->GetName(), probot->GetLinks().size());
+        ROS_INFO("generating convex hulls for robot %S, num links: %"PRIdS, probot->GetName(), probot->GetLinks().size());
 
         ros::Time starthull = ros::Time::now();
         _vLinkHulls.resize(probot->GetLinks().size());
@@ -161,7 +167,7 @@
             // compute convex hull
             if( compute_convex_hull((*itlink)->GetCollisionData().vertices, ithull->vconvexhull) ) {
                 totalplanes += ithull->vconvexhull.size();
-                ROS_DEBUG("link %S convex hull has %lu planes", (*itlink)->GetName(), ithull->vconvexhull.size());
+                ROS_DEBUG("link %S convex hull has %"PRIdS" planes", (*itlink)->GetName(), ithull->vconvexhull.size());
             }
             else
                 ROS_ERROR("failed to compute convex hull for link %S", (*itlink)->GetName());
@@ -170,7 +176,7 @@
             ++ithull;
         }
 
-        ROS_INFO("total convex planes: %lu, time: %fs", totalplanes, (ros::Time::now()-starthull).toSec());
+        ROS_INFO("total convex planes: %"PRIdS", time: %fs", totalplanes, (ros::Time::now()-starthull).toSec());
 
         return true;
     }


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